minor #16697 CS: remove impossible default argument value (keradus)

fabpot · fabpot · commit 0cb308f634c8 · 2015-11-28T11:22:51.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- CS: remove impossible default argument value | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | ? | Fixed tickets | N/A | License | MIT | Doc PR | N/A Commits ------- acef3a3 CS: remove impossible default argument value
diff --git a/src/Symfony/Component/Asset/UrlPackage.php b/src/Symfony/Component/Asset/UrlPackage.php
@@ -39,10 +39,11 @@ class UrlPackage extends Package
     private $sslPackage;
 
     /**
-     * @param string|array             $baseUrls        Base asset URLs
+     * @param string|string[]          $baseUrls        Base asset URLs
      * @param VersionStrategyInterface $versionStrategy The version strategy
+     * @param ContextInterface|null    $context         Context
      */
-    public function __construct($baseUrls = array(), VersionStrategyInterface $versionStrategy, ContextInterface $context = null)
+    public function __construct($baseUrls, VersionStrategyInterface $versionStrategy, ContextInterface $context = null)
     {
         parent::__construct($versionStrategy, $context);
 
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -217,7 +217,7 @@ public function getData()
         return $this->data;
     }
 
-    private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output = null, array &$outputByHash)
+    private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output, array &$outputByHash)
     {
         $hash = spl_object_hash($form);
 
@@ -236,7 +236,7 @@ private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output
         }
     }
 
-    private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output = null, array &$outputByHash)
+    private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output, array &$outputByHash)
     {
         $viewHash = spl_object_hash($view);
         $formHash = null;
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -224,7 +224,7 @@ protected function controllerMethod2($foo, $bar = null)
     {
     }
 
-    protected function controllerMethod3($foo, $bar = null, $foobar)
+    protected function controllerMethod3($foo, $bar, $foobar)
     {
     }
 
diff --git a/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php
@@ -56,7 +56,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged
      * @param array                               $loadedSids
      * @param bool                                $entriesInheriting
      */
-    public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting)
+    public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids, $entriesInheriting)
     {
         $this->id = $id;
         $this->objectIdentity = $objectIdentity;
diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
@@ -45,7 +45,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices
      * @param LoggerInterface       $logger
      * @param SecureRandomInterface $secureRandom
      */
-    public function __construct(array $userProviders, $key, $providerKey, array $options = array(), LoggerInterface $logger = null, SecureRandomInterface $secureRandom)
+    public function __construct(array $userProviders, $key, $providerKey, array $options, LoggerInterface $logger = null, SecureRandomInterface $secureRandom)
     {
         parent::__construct($userProviders, $key, $providerKey, $options, $logger);
 

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public function getData()`
`217`	`217`	`return $this->data;`
`218`	`218`	`}`
`219`	`219`
`220`		`- private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output = null, array &$outputByHash)`
	`220`	`+ private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output, array &$outputByHash)`
`221`	`221`	`{`
`222`	`222`	`$hash = spl_object_hash($form);`
`223`	`223`
`@@ -236,7 +236,7 @@ private function recursiveBuildPreliminaryFormTree(FormInterface $form, &$output`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
`239`		`- private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output = null, array &$outputByHash)`
	`239`	`+ private function recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, &$output, array &$outputByHash)`
`240`	`240`	`{`
`241`	`241`	`$viewHash = spl_object_hash($view);`
`242`	`242`	`$formHash = null;`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ protected function controllerMethod2($foo, $bar = null)`
`224`	`224`	`{`
`225`	`225`	`}`
`226`	`226`
`227`		`- protected function controllerMethod3($foo, $bar = null, $foobar)`
	`227`	`+ protected function controllerMethod3($foo, $bar, $foobar)`
`228`	`228`	`{`
`229`	`229`	`}`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged`
`56`	`56`	`* @param array $loadedSids`
`57`	`57`	`* @param bool $entriesInheriting`
`58`	`58`	`*/`
`59`		`- public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting)`
	`59`	`+ public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids, $entriesInheriting)`
`60`	`60`	`{`
`61`	`61`	`$this->id = $id;`
`62`	`62`	`$this->objectIdentity = $objectIdentity;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices`
`45`	`45`	`* @param LoggerInterface $logger`
`46`	`46`	`* @param SecureRandomInterface $secureRandom`
`47`	`47`	`*/`
`48`		`- public function __construct(array $userProviders, $key, $providerKey, array $options = array(), LoggerInterface $logger = null, SecureRandomInterface $secureRandom)`
	`48`	`+ public function __construct(array $userProviders, $key, $providerKey, array $options, LoggerInterface $logger = null, SecureRandomInterface $secureRandom)`
`49`	`49`	`{`
`50`	`50`	`parent::__construct($userProviders, $key, $providerKey, $options, $logger);`
`51`	`51`