Skip to content

Commit 67d03bc

Browse files
PowerKiKiPowerKiKi
committed
Update PHP-Cs-Fixer
1 parent 1e3de01 commit 67d03bc

File tree

368 files changed

+1068
-901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

368 files changed

+1068
-901
lines changed

‎composer.lock

Lines changed: 212 additions & 258 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎library/Zend/Acl.php

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ public function removeAll()
506506
* @param array|string|Zend_Acl_Role_Interface $roles
507507
* @param array|string|Zend_Acl_Resource_Interface $resources
508508
* @param array|string $privileges
509-
* @param Zend_Acl_Assert_Interface $assert
510509
*
511510
* @uses Zend_Acl::setRule()
512511
*
@@ -523,7 +522,6 @@ public function allow($roles = null, $resources = null, $privileges = null, ?Zen
523522
* @param array|string|Zend_Acl_Role_Interface $roles
524523
* @param array|string|Zend_Acl_Resource_Interface $resources
525524
* @param array|string $privileges
526-
* @param Zend_Acl_Assert_Interface $assert
527525
*
528526
* @uses Zend_Acl::setRule()
529527
*
@@ -612,7 +610,6 @@ public function removeDeny($roles = null, $resources = null, $privileges = null)
612610
* @param array|string|Zend_Acl_Role_Interface $roles
613611
* @param array|string|Zend_Acl_Resource_Interface $resources
614612
* @param array|string $privileges
615-
* @param Zend_Acl_Assert_Interface $assert
616613
*
617614
* @uses Zend_Acl_Role_Registry::get()
618615
* @uses Zend_Acl::get()
@@ -681,7 +678,6 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
681678
}
682679

683680
switch ($operation) {
684-
685681
// add to the rules
686682
case self::OP_ADD:
687683
if ($resources !== null) {
@@ -721,7 +717,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
721717

722718
break;
723719

724-
// remove from the rules
720+
// remove from the rules
725721
case self::OP_REMOVE:
726722
if ($resources !== null) {
727723
// this block will iterate the provided resources
@@ -940,8 +936,6 @@ protected function _getRoleRegistry()
940936
* This method returns true if a rule is found and allows access. If a rule exists and denies access,
941937
* then this method returns false. If no applicable rule is found, then this method returns null.
942938
*
943-
* @param Zend_Acl_Resource_Interface $resource
944-
*
945939
* @return null|bool
946940
*/
947941
protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, ?Zend_Acl_Resource_Interface $resource = null)
@@ -974,7 +968,6 @@ protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, ?Zend_Ac
974968
*
975969
* This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
976970
*
977-
* @param Zend_Acl_Resource_Interface $resource
978971
* @param array $dfs
979972
*
980973
* @return null|bool
@@ -1017,7 +1010,6 @@ protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, ?Ze
10171010
* This method returns true if a rule is found and allows access. If a rule exists and denies access,
10181011
* then this method returns false. If no applicable rule is found, then this method returns null.
10191012
*
1020-
* @param Zend_Acl_Resource_Interface $resource
10211013
* @param string $privilege
10221014
*
10231015
* @return null|bool
@@ -1062,7 +1054,6 @@ protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, ?Zend_Acl
10621054
*
10631055
* This method is used by the internal depth-first search algorithm and may modify the DFS data structure.
10641056
*
1065-
* @param Zend_Acl_Resource_Interface $resource
10661057
* @param string $privilege
10671058
* @param array $dfs
10681059
*
@@ -1120,8 +1111,6 @@ protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, ?Zen
11201111
* If all three parameters are null, then the default ACL rule type is returned,
11211112
* based on whether its assertion method passes.
11221113
*
1123-
* @param Zend_Acl_Resource_Interface $resource
1124-
* @param Zend_Acl_Role_Interface $role
11251114
* @param string $privilege
11261115
*
11271116
* @return null|string
@@ -1156,7 +1145,7 @@ protected function _getRuleType(?Zend_Acl_Resource_Interface $resource = null, ?
11561145
($this->_isAllowedRole instanceof Zend_Acl_Role_Interface) ? $this->_isAllowedRole : $role,
11571146
($this->_isAllowedResource instanceof Zend_Acl_Resource_Interface) ? $this->_isAllowedResource : $resource,
11581147
$this->_isAllowedPrivilege
1159-
);
1148+
);
11601149
}
11611150

11621151
if (null === $rule['assert'] || $assertionValue) {
@@ -1180,14 +1169,12 @@ protected function _getRuleType(?Zend_Acl_Resource_Interface $resource = null, ?
11801169
*
11811170
* If the $create parameter is true, then a rule set is first created and then returned to the caller.
11821171
*
1183-
* @param Zend_Acl_Resource_Interface $resource
1184-
* @param Zend_Acl_Role_Interface $role
11851172
* @param bool $create
11861173
*
11871174
* @return null|array
11881175
*/
11891176
protected function &_getRules(?Zend_Acl_Resource_Interface $resource = null, ?Zend_Acl_Role_Interface $role = null,
1190-
$create = false)
1177+
$create = false)
11911178
{
11921179
// create a reference to null
11931180
$null = null;

‎library/Zend/Acl/Assert/Interface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ interface Zend_Acl_Assert_Interface
4444
* $role, $resource, or $privilege parameters are null, it means that the query applies to all Roles, Resources, or
4545
* privileges, respectively.
4646
*
47-
* @param Zend_Acl_Role_Interface $role
48-
* @param Zend_Acl_Resource_Interface $resource
4947
* @param string $privilege
5048
*
5149
* @return bool

‎library/Zend/Application/Bootstrap/BootstrapAbstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838
abstract class Zend_Application_Bootstrap_BootstrapAbstract implements
3939
Zend_Application_Bootstrap_Bootstrapper,
40-
Zend_Application_Bootstrap_ResourceBootstrapper
40+
Zend_Application_Bootstrap_ResourceBootstrapper
4141
{
4242
/**
4343
* @var Zend_Application|Zend_Application_Bootstrap_Bootstrapper

‎library/Zend/Cache/Backend/File.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -913,16 +913,16 @@ protected function _expireTime($lifetime)
913913
protected function _hash($data, $controlType)
914914
{
915915
switch ($controlType) {
916-
case 'md5':
917-
return md5($data);
918-
case 'crc32':
919-
return crc32($data);
920-
case 'strlen':
921-
return strlen($data);
922-
case 'adler32':
923-
return hash('adler32', $data);
924-
default:
925-
Zend_Cache::throwException("Incorrect hash function : $controlType");
916+
case 'md5':
917+
return md5($data);
918+
case 'crc32':
919+
return crc32($data);
920+
case 'strlen':
921+
return strlen($data);
922+
case 'adler32':
923+
return hash('adler32', $data);
924+
default:
925+
Zend_Cache::throwException("Incorrect hash function : $controlType");
926926
}
927927
}
928928

‎library/Zend/Cache/Frontend/Page.php

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -357,36 +357,36 @@ protected function _makeId()
357357
protected function _makePartialId($arrayName, $bool1, $bool2)
358358
{
359359
switch ($arrayName) {
360-
case 'Get':
361-
$var = $_GET;
360+
case 'Get':
361+
$var = $_GET;
362362

363-
break;
364-
case 'Post':
365-
$var = $_POST;
363+
break;
364+
case 'Post':
365+
$var = $_POST;
366366

367-
break;
368-
case 'Session':
369-
if (isset($_SESSION)) {
370-
$var = $_SESSION;
371-
} else {
372-
$var = null;
373-
}
367+
break;
368+
case 'Session':
369+
if (isset($_SESSION)) {
370+
$var = $_SESSION;
371+
} else {
372+
$var = null;
373+
}
374374

375-
break;
376-
case 'Cookie':
377-
if (isset($_COOKIE)) {
378-
$var = $_COOKIE;
379-
} else {
380-
$var = null;
381-
}
375+
break;
376+
case 'Cookie':
377+
if (isset($_COOKIE)) {
378+
$var = $_COOKIE;
379+
} else {
380+
$var = null;
381+
}
382382

383-
break;
384-
case 'Files':
385-
$var = $_FILES;
383+
break;
384+
case 'Files':
385+
$var = $_FILES;
386386

387-
break;
388-
default:
389-
return false;
387+
break;
388+
default:
389+
return false;
390390
}
391391
if ($bool1) {
392392
if ($bool2) {

‎library/Zend/Captcha/Adapter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public function generate();
3939
/**
4040
* Display the captcha.
4141
*
42-
* @param Zend_View_Interface $view
4342
* @param mixed $element
4443
*
4544
* @return string

‎library/Zend/Captcha/Dumb.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public function getLabel()
6060
/**
6161
* Render the captcha.
6262
*
63-
* @param Zend_View_Interface $view
6463
* @param mixed $element
6564
*
6665
* @return string

‎library/Zend/Captcha/Figlet.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public function generate()
6666
/**
6767
* Display the captcha.
6868
*
69-
* @param Zend_View_Interface $view
7069
* @param mixed $element
7170
*
7271
* @return string

‎library/Zend/Captcha/Image.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,6 @@ protected function _gc()
646646
/**
647647
* Display the captcha.
648648
*
649-
* @param Zend_View_Interface $view
650649
* @param mixed $element
651650
*
652651
* @return string

0 commit comments

Comments
 (0)