Skip to content

Commit

Permalink
Merge pull request #77 from froschdesign/hotfix/wrong-deprecation
Browse files Browse the repository at this point in the history
Removes deprecation messages which lead to irritation because there are no alternative paths for implementation
  • Loading branch information
Ocramius authored Nov 4, 2022
2 parents 2b7b62c + bf5edac commit ec8b923
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 38 deletions.
7 changes: 0 additions & 7 deletions src/EmptyContextInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,15 @@

namespace Laminas\InputFilter;

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain.
*/
interface EmptyContextInterface
{
/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain and set this to `true`.
*
* @param bool $continueIfEmpty
* @return self
*/
public function setContinueIfEmpty($continueIfEmpty);

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain. Should always return `true`.
*
* @return bool
*/
public function continueIfEmpty();
Expand Down
2 changes: 0 additions & 2 deletions src/FileInput.php
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ public function merge(InputInterface $input)
}

/**
* @deprecated 2.4.8 See note on parent class. Removal does not affect this class.
*
* No-op, NotEmpty validator does not apply for FileInputs.
* See also: BaseInputFilter::isValid()
*
Expand Down
28 changes: 3 additions & 25 deletions src/Input.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ class Input implements
InputInterface,
EmptyContextInterface
{
/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain.
*
* @var bool
*/
/** @var bool */
protected $allowEmpty = false;

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain.
*
* @var bool
*/
/** @var bool */
protected $continueIfEmpty = false;

/** @var bool */
Expand All @@ -43,11 +35,7 @@ class Input implements
/** @var null|string */
protected $name;

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain.
*
* @var bool
*/
/** @var bool */
protected $notEmptyValidator = false;

/** @var bool */
Expand Down Expand Up @@ -79,8 +67,6 @@ public function __construct($name = null)
}

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain and set this to `true`.
*
* @param bool $allowEmpty
* @return $this
*/
Expand All @@ -101,8 +87,6 @@ public function setBreakOnFailure($breakOnFailure)
}

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain and set this to `true`.
*
* @param bool $continueIfEmpty
* @return $this
*/
Expand Down Expand Up @@ -208,8 +192,6 @@ public function setFallbackValue($value)
}

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain.
*
* @return bool
*/
public function allowEmpty()
Expand All @@ -226,8 +208,6 @@ public function breakOnFailure()
}

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain. Should always return `true`.
*
* @return bool
*/
public function continueIfEmpty()
Expand Down Expand Up @@ -440,8 +420,6 @@ public function getMessages()
}

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain.
*
* @return void
*/
protected function injectNotEmptyValidator()
Expand Down
4 changes: 0 additions & 4 deletions src/InputInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
interface InputInterface
{
/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain and set this to `true`.
*
* @param bool $allowEmpty
* @return $this
*/
Expand Down Expand Up @@ -63,8 +61,6 @@ public function setValue($value);
public function merge(InputInterface $input);

/**
* @deprecated 2.4.8 Add Laminas\Validator\NotEmpty validator to the ValidatorChain.
*
* @return bool
*/
public function allowEmpty();
Expand Down

0 comments on commit ec8b923

Please sign in to comment.