diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Fabien Potencier 2015-11-28 11:22:51 +01:00
commit 0cb308f634
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Asset/UrlPackage.php
View File

@ -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);

4
src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
View File

@ -217,7 +217,7 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
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 @@ class FormDataCollector extends DataCollector implements FormDataCollectorInterf
}
}
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;

2
src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
View File

@ -224,7 +224,7 @@ class ControllerResolverTest extends \PHPUnit_Framework_TestCase
{
}
protected function controllerMethod3($foo, $bar = null, $foobar)
protected function controllerMethod3($foo, $bar, $foobar)
{
}

2
src/Symfony/Component/Security/Acl/Domain/Acl.php
View File

@ -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;

2
src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php
View File

@ -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);