Skip to content

PHP 8.4: Implicitly nullable parameter declarations deprecated #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcing wants to merge 1 commit into
base: php84
Choose a base branch
from
Open

PHP 8.4: Implicitly nullable parameter declarations deprecated #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@
"name": "zf1s/zf1",
"description": "Zend Framework 1 complete package, PHP 5.3-8.3 compatible. Please consider using individual zf1s/zend-* packages instead - see README.",
"license": "BSD-3-Clause",
"repositories": [
{
"type": "git",
"url": "[email protected]:zf1s/compat.git"
}
],
"require": {
"php": ">=5.3.3",
"symfony/polyfill-php70": "^1.19"
"symfony/polyfill-php70": "^1.19",
"zf1s/compat": "^1.0"
},
"require-dev": {
"ext-ctype": "*",
Expand Down
83 changes: 53 additions & 30 deletions packages/zend-acl/library/Zend/Acl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use Zf1s\Compat\Types;

/**
* Zend Framework
*
Expand Down Expand Up @@ -495,12 +498,14 @@ public function removeAll()
* @param Zend_Acl_Role_Interface|string|array $roles
* @param Zend_Acl_Resource_Interface|string|array $resources
* @param string|array $privileges
* @param Zend_Acl_Assert_Interface $assert
* @param Zend_Acl_Assert_Interface|null $assert
* @uses Zend_Acl::setRule()
* @return Zend_Acl Provides a fluent interface
*/
public function allow($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
public function allow($roles = null, $resources = null, $privileges = null, $assert = null)
{
Types::isNullable('assert', $assert, 'Zend_Acl_Assert_Interface');

return $this->setRule(self::OP_ADD, self::TYPE_ALLOW, $roles, $resources, $privileges, $assert);
}

Expand All @@ -510,12 +515,14 @@ public function allow($roles = null, $resources = null, $privileges = null, Zend
* @param Zend_Acl_Role_Interface|string|array $roles
* @param Zend_Acl_Resource_Interface|string|array $resources
* @param string|array $privileges
* @param Zend_Acl_Assert_Interface $assert
* @param Zend_Acl_Assert_Interface|null $assert
* @uses Zend_Acl::setRule()
* @return Zend_Acl Provides a fluent interface
*/
public function deny($roles = null, $resources = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
public function deny($roles = null, $resources = null, $privileges = null, $assert = null)
{
Types::isNullable('assert', $assert, 'Zend_Acl_Assert_Interface');

return $this->setRule(self::OP_ADD, self::TYPE_DENY, $roles, $resources, $privileges, $assert);
}

Expand Down Expand Up @@ -593,15 +600,17 @@ public function removeDeny($roles = null, $resources = null, $privileges = null)
* @param Zend_Acl_Role_Interface|string|array $roles
* @param Zend_Acl_Resource_Interface|string|array $resources
* @param string|array $privileges
* @param Zend_Acl_Assert_Interface $assert
* @param Zend_Acl_Assert_Interface|null $assert
* @throws Zend_Acl_Exception
* @uses Zend_Acl_Role_Registry::get()
* @uses Zend_Acl::get()
* @return Zend_Acl Provides a fluent interface
*/
public function setRule($operation, $type, $roles = null, $resources = null, $privileges = null,
Zend_Acl_Assert_Interface $assert = null)
$assert = null)
{
Types::isNullable('assert', $assert, 'Zend_Acl_Assert_Interface');

// ensure that the rule type is valid; normalize input to uppercase
$type = strtoupper($type);
if (self::TYPE_ALLOW !== $type && self::TYPE_DENY !== $type) {
Expand Down Expand Up @@ -915,12 +924,14 @@ protected function _getRoleRegistry()
* This method returns true if a rule is found and allows access. If a rule exists and denies access,
* then this method returns false. If no applicable rule is found, then this method returns null.
*
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface $resource
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface|null $resource
* @return boolean|null
*/
protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null)
protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, $resource = null)
{
Types::isNullable('resource', $resource, 'Zend_Acl_Resource_Interface');

$dfs = array(
'visited' => array(),
'stack' => array()
Expand Down Expand Up @@ -949,15 +960,17 @@ protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl
*
* This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
*
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface $resource
* @param array $dfs
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface|null $resource
* @param array $dfs
* @return boolean|null
* @throws Zend_Acl_Exception
*/
protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, $resource = null,
&$dfs = null)
{
Types::isNullable('resource', $resource, 'Zend_Acl_Resource_Interface');

if (null === $dfs) {
/**
* @see Zend_Acl_Exception
Expand Down Expand Up @@ -992,15 +1005,17 @@ protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, Zen
* This method returns true if a rule is found and allows access. If a rule exists and denies access,
* then this method returns false. If no applicable rule is found, then this method returns null.
*
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface $resource
* @param string $privilege
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface|null $resource
* @param string $privilege
* @return boolean|null
* @throws Zend_Acl_Exception
*/
protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, $resource = null,
$privilege = null)
{
Types::isNullable('resource', $resource, 'Zend_Acl_Resource_Interface');

if (null === $privilege) {
/**
* @see Zend_Acl_Exception
Expand Down Expand Up @@ -1037,16 +1052,18 @@ protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_
*
* This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
*
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface $resource
* @param string $privilege
* @param array $dfs
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface|null $resource
* @param string $privilege
* @param array $dfs
* @return boolean|null
* @throws Zend_Acl_Exception
*/
protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_Resource_Interface $resource = null,
protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, $resource = null,
$privilege = null, &$dfs = null)
{
Types::isNullable('resource', $resource, 'Zend_Acl_Resource_Interface');

if (null === $privilege) {
/**
* @see Zend_Acl_Exception
Expand Down Expand Up @@ -1093,14 +1110,17 @@ protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend
* If all three parameters are null, then the default ACL rule type is returned,
* based on whether its assertion method passes.
*
* @param Zend_Acl_Resource_Interface $resource
* @param Zend_Acl_Role_Interface $role
* @param string $privilege
* @param Zend_Acl_Resource_Interface|null $resource
* @param Zend_Acl_Role_Interface|null $role
* @param string $privilege
* @return string|null
*/
protected function _getRuleType(Zend_Acl_Resource_Interface $resource = null, Zend_Acl_Role_Interface $role = null,
protected function _getRuleType($resource = null, $role = null,
$privilege = null)
{
Types::isNullable('resource', $resource, 'Zend_Acl_Resource_Interface');
Types::isNullable('role', $role, 'Zend_Acl_Role_Interface');

// get the rules for the $resource and $role
if (null === ($rules = $this->_getRules($resource, $role))) {
return null;
Expand Down Expand Up @@ -1149,14 +1169,17 @@ protected function _getRuleType(Zend_Acl_Resource_Interface $resource = null, Ze
*
* If the $create parameter is true, then a rule set is first created and then returned to the caller.
*
* @param Zend_Acl_Resource_Interface $resource
* @param Zend_Acl_Role_Interface $role
* @param boolean $create
* @param Zend_Acl_Resource_Interface|null $resource
* @param Zend_Acl_Role_Interface|null $role
* @param boolean $create
* @return array|null
*/
protected function &_getRules(Zend_Acl_Resource_Interface $resource = null, Zend_Acl_Role_Interface $role = null,
protected function &_getRules($resource = null, $role = null,
$create = false)
{
Types::isNullable('resource', $resource, 'Zend_Acl_Resource_Interface');
Types::isNullable('role', $role, 'Zend_Acl_Role_Interface');

// create a reference to null
$null = null;
$nullRef =& $null;
Expand Down
6 changes: 3 additions & 3 deletions packages/zend-acl/library/Zend/Acl/Assert/Interface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ interface Zend_Acl_Assert_Interface
* privileges, respectively.
*
* @param Zend_Acl $acl
* @param Zend_Acl_Role_Interface $role
* @param Zend_Acl_Resource_Interface $resource
* @param null|Zend_Acl_Role_Interface $role
* @param null|Zend_Acl_Resource_Interface $resource
* @param string $privilege
* @return boolean
*/
public function assert(Zend_Acl $acl, Zend_Acl_Role_Interface $role = null, Zend_Acl_Resource_Interface $resource = null,
public function assert(Zend_Acl $acl, $role = null, $resource = null,
$privilege = null);
}
15 changes: 11 additions & 4 deletions packages/zend-auth/library/Zend/Auth/Adapter/DbTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use Zf1s\Compat\Types;

/**
* Zend Framework
*
Expand Down Expand Up @@ -127,15 +130,17 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface
/**
* __construct() - Sets configuration options
*
* @param Zend_Db_Adapter_Abstract $zendDb If null, default database adapter assumed
* @param Zend_Db_Adapter_Abstract|null $zendDb If null, default database adapter assumed
* @param string $tableName
* @param string $identityColumn
* @param string $credentialColumn
* @param string $credentialTreatment
*/
public function __construct(Zend_Db_Adapter_Abstract $zendDb = null, $tableName = null, $identityColumn = null,
public function __construct($zendDb = null, $tableName = null, $identityColumn = null,
$credentialColumn = null, $credentialTreatment = null)
{
Types::isNullable('zendDb', $zendDb, 'Zend_Db_Adapter_Abstract');

$this->_setDbAdapter($zendDb);

if (null !== $tableName) {
Expand All @@ -158,12 +163,14 @@ public function __construct(Zend_Db_Adapter_Abstract $zendDb = null, $tableName
/**
* _setDbAdapter() - set the database adapter to be used for quering
*
* @param Zend_Db_Adapter_Abstract
* @param Zend_Db_Adapter_Abstract|null $zendDb
* @throws Zend_Auth_Adapter_Exception
* @return Zend_Auth_Adapter_DbTable
*/
protected function _setDbAdapter(Zend_Db_Adapter_Abstract $zendDb = null)
protected function _setDbAdapter($zendDb = null)
{
Types::isNullable('zendDb', $zendDb, 'Zend_Db_Adapter_Abstract');

$this->_zendDb = $zendDb;

/**
Expand Down
15 changes: 11 additions & 4 deletions packages/zend-auth/library/Zend/Auth/Adapter/OpenId.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use Zf1s\Compat\Types;

/**
* Zend Framework
*
Expand Down Expand Up @@ -106,20 +109,24 @@ class Zend_Auth_Adapter_OpenId implements Zend_Auth_Adapter_Interface
* Constructor
*
* @param string $id the identity value
* @param Zend_OpenId_Consumer_Storage $storage an optional implementation
* @param Zend_OpenId_Consumer_Storage|null $storage an optional implementation
* of a storage object
* @param string $returnTo HTTP URL to redirect response from server to
* @param string $root HTTP URL to identify consumer on server
* @param mixed $extensions extension object or array of extensions objects
* @param Zend_Controller_Response_Abstract $response an optional response
* @param Zend_Controller_Response_Abstract|null $response an optional response
* object to perform HTTP or HTML form redirection
*/
public function __construct($id = null,
Zend_OpenId_Consumer_Storage $storage = null,
$storage = null,
$returnTo = null,
$root = null,
$extensions = null,
Zend_Controller_Response_Abstract $response = null) {
$response = null) {

Types::isNullable('storage', $storage, 'Zend_OpenId_Consumer_Storage');
Types::isNullable('response', $response, 'Zend_Controller_Response_Abstract');

$this->_id = $id;
$this->_storage = $storage;
$this->_returnTo = $returnTo;
Expand Down
7 changes: 6 additions & 1 deletion packages/zend-cache/library/Zend/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use Zf1s\Compat\Types;

/**
* Zend Framework
*
Expand Down Expand Up @@ -202,8 +205,10 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus
* @param string $msg Message for the exception
* @throws Zend_Cache_Exception
*/
public static function throwException($msg, Exception $e = null)
public static function throwException($msg, $e = null)
{
Types::isNullable('e', $e, 'Exception');

// For perfs reasons, we use this dynamic inclusion
// require_once 'Zend/Cache/Exception.php';
throw new Zend_Cache_Exception($msg, 0, $e);
Expand Down
4 changes: 2 additions & 2 deletions packages/zend-captcha/library/Zend/Captcha/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ public function generate();
/**
* Display the captcha
*
* @param Zend_View_Interface $view
* @param Zend_View_Interface|null $view
* @param mixed $element
* @return string
*/
public function render(Zend_View_Interface $view = null, $element = null);
public function render($view = null, $element = null);

/**
* Set captcha name
Expand Down
13 changes: 9 additions & 4 deletions packages/zend-captcha/library/Zend/Captcha/Dumb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use Zf1s\Compat\Types;

/**
* Zend Framework
*
Expand Down Expand Up @@ -41,7 +44,7 @@ class Zend_Captcha_Dumb extends Zend_Captcha_Word
* @type string
*/
protected $_label = 'Please type this word backwards';

/**
* Set the label for the CAPTCHA
* @param string $label
Expand All @@ -50,7 +53,7 @@ public function setLabel($label)
{
$this->_label = $label;
}

/**
* Retrieve the label for the CAPTCHA
* @return string
Expand All @@ -62,12 +65,14 @@ public function getLabel()
/**
* Render the captcha
*
* @param Zend_View_Interface $view
* @param Zend_View_Interface|null $view
* @param mixed $element
* @return string
*/
public function render(Zend_View_Interface $view = null, $element = null)
public function render($view = null, $element = null)
{
Types::isNullable('view', $view, 'Zend_View_Interface');

return $this->getLabel() . ': <b>'
. strrev($this->getWord())
. '</b>';
Expand Down
Loading
Loading