NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit33a001e

committed

switched array() to []

1 parentc7f46e4 commit33a001eCopy full SHA for 33a001e

File tree

2,234 files changed

+32060

-32060

lines changed

.php_cs.dist
src/Symfony
- Bridge
  - Doctrine
    - ContainerAwareEventManager.php
    - DataCollector
      - DoctrineDataCollector.php
    - DependencyInjection
      - AbstractDoctrineExtension.php
      - CompilerPass
        RegisterEventListenersAndSubscribersPass.php
        RegisterMappingsPass.php
    - Form
      - ChoiceList
        DoctrineChoiceLoader.php
        IdReader.php
        ORMQueryBuilderLoader.php
      - DataTransformer
        CollectionToArrayTransformer.php
      - DoctrineOrmExtension.php
      - DoctrineOrmTypeGuesser.php
      - EventListener
        MergeDoctrineCollectionListener.php
      - Type
        DoctrineType.php
        EntityType.php
    - HttpFoundation
      - DbalSessionHandlerSchema.php
    - Logger
      - DbalLogger.php
    - PropertyInfo
      - DoctrineExtractor.php
    - Security
      - RememberMe
        DoctrineTokenProvider.php
      - User
        EntityUserProvider.php
    - Tests
      - ContainerAwareEventManagerTest.php
      - DataCollector
        DoctrineDataCollectorTest.php
      - DependencyInjection
        CompilerPass
        RegisterEventListenersAndSubscribersPassTest.php
        RegisterMappingsPassTest.php
        DoctrineExtensionTest.php
      - Fixtures
        SingleIntIdEntity.php
      - Form
        ChoiceList
        DoctrineChoiceLoaderTest.php
        ORMQueryBuilderLoaderTest.php
        DataTransformer
        CollectionToArrayTransformerTest.php
        DoctrineOrmTypeGuesserTest.php
        EventListener
        MergeDoctrineCollectionListenerTest.php
        Type
        EntityTypePerformanceTest.php
        EntityTypeTest.php
      - Logger
        DbalLoggerTest.php
      - ManagerRegistryTest.php
      - PropertyInfo
        DoctrineExtractorTest.php
        Fixtures
        DoctrineFooType.php
      - Security/User
        EntityUserProviderTest.php
      - Validator/Constraints
        UniqueEntityValidatorTest.php
    - Test
      - DoctrineTestHelper.php
      - TestRepositoryFactory.php
    - Validator/Constraints
      - UniqueEntity.php
      - UniqueEntityValidator.php
  - Monolog
    - Formatter
      - ConsoleFormatter.php
    - Handler
    - Logger.php
    - Processor
    - Tests
      - Handler
        ConsoleHandlerTest.php
        FingersCrossed
        NotFoundActivationStrategyTest.php
      - LoggerTest.php
      - Processor
        TokenProcessorTest.php
        WebProcessorTest.php
  - PhpUnit
  - ProxyManager/Tests/LazyProxy
    - Dumper
      - PhpDumperTest.php
    - Fixtures/includes
      - foo.php
    - PhpDumper
      - ProxyDumperTest.php
  - Twig
- Bundle
  - DebugBundle
    - DependencyInjection
      - DebugExtension.php
    - Tests/DependencyInjection
      - Compiler
        DumpDataCollectorPassTest.php
      - DebugExtensionTest.php
  - FrameworkBundle
  - SecurityBundle
    - Command
      - SetAclCommand.php
      - UserPasswordEncoderCommand.php
    - DataCollector
      - SecurityDataCollector.php
    - Debug
      - WrappedListener.php
    - DependencyInjection
    - Security
    - Tests
      - DataCollector
        SecurityDataCollectorTest.php
      - Debug
        TraceableFirewallListenerTest.php
      - DependencyInjection
        Compiler
        AddSecurityVotersPassTest.php
        AddSessionDomainConstraintPassTest.php
        CompleteConfigurationTest.php
        Fixtures/php
        access_decision_manager_customized_config.php
        access_decision_manager_default_strategy.php
        access_decision_manager_service.php
        access_decision_manager_service_and_strategy.php
        argon2i_encoder.php
        container1.php
        container1_with_acl.php
        container1_with_digest.php
        custom_acl_provider.php
        firewall_provider.php
        firewall_undefined_provider.php
        listener_provider.php
        listener_undefined_provider.php
        merge.php
        merge_import.php
        no_custom_user_checker.php
        remember_me_options.php
        MainConfigurationTest.php
        SecurityExtensionTest.php
        Security/Factory
        AbstractFactoryTest.php
        GuardAuthenticationFactoryTest.php
      - Functional
        AuthenticationCommencingTest.php
        AutowiringTypesTest.php
        Bundle
        CsrfFormLoginBundle
        Controller
        LoginController.php
        Form
        UserLoginType.php
        FormLoginBundle
        Controller
        LocalizedController.php
        LoginController.php
        Security
        LocalizedFormFailureHandler.php
        JsonLoginBundle
        Controller
        TestController.php
        Security/Http
        JsonAuthenticationFailureHandler.php
        JsonAuthenticationSuccessHandler.php
        CsrfFormLoginTest.php
        FirewallEntryPointTest.php
        FormLoginTest.php
        JsonLoginTest.php
        LocalizedRoutesAsPathTest.php
        LogoutTest.php
        SecurityRoutingIntegrationTest.php
        SecurityTest.php
        SetAclCommandTest.php
        SwitchUserTest.php
        UserPasswordEncoderCommandTest.php
        WebTestCase.php
        app
        Acl
        bundles.php
        AppKernel.php
        AutowiringTypes
        bundles.php
        CsrfFormLogin
        bundles.php
        FirewallEntryPoint
        bundles.php
        JsonLogin
        bundles.php
        LogoutAccess
        bundles.php
        LogoutWithoutSessionInvalidation
        bundles.php
        PasswordEncode
        bundles.php
        RememberMeLogout
        bundles.php
        SecurityHelper
        bundles.php
        StandardFormLogin
        bundles.php
      - SecurityUserValueResolverTest.php
      - Security
        FirewallConfigTest.php
        FirewallContextTest.php
        FirewallMapTest.php
  - TwigBundle
    - CacheWarmer
      - TemplateCacheCacheWarmer.php
      - TemplateCacheWarmer.php
    - Controller
      - ExceptionController.php
      - PreviewErrorController.php
    - DependencyInjection
    - Loader
      - FilesystemLoader.php
    - TemplateIterator.php
    - Tests
      - ContainerAwareRuntimeLoaderTest.php
      - Controller
        ExceptionControllerTest.php
      - DependencyInjection
        Compiler
        ExtensionPassTest.php
        TwigLoaderPassTest.php
        ConfigurationTest.php
        Fixtures/php
        customTemplateEscapingGuesser.php
        empty.php
        extra.php
        formats.php
        full.php
        TwigExtensionTest.php
      - Functional
        CacheWarmingTest.php
        EmptyAppTest.php
        NoTemplatingEntryTest.php
      - TemplateIteratorTest.php
    - TwigEngine.php
  - WebProfilerBundle
    - Controller
    - Csp
      - ContentSecurityPolicyHandler.php
    - DependencyInjection
      - Configuration.php
    - EventListener
      - WebDebugToolbarListener.php
    - Profiler
      - TemplateManager.php
    - Tests
      - Controller
        ProfilerControllerTest.php
      - Csp
        ContentSecurityPolicyHandlerTest.php
      - DependencyInjection
        ConfigurationTest.php
        WebProfilerExtensionTest.php
      - EventListener
        WebDebugToolbarListenerTest.php
      - Profiler
        TemplateManagerTest.php
    - Twig
      - WebProfilerExtension.php
  - WebServerBundle
    - Command
    - Tests/DependencyInjection
      - WebServerExtensionTest.php
    - WebServer.php
    - WebServerConfig.php
- Component

Some content is hidden

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

2,234 files changed

+32060

-32060

lines changed

`‎.php_cs.dist‎`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,26 +5,26 @@ if (!file_exists(__DIR__.'/src')) {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`returnPhpCsFixer\Config::create()`
`8`		`- ->setRules(array(`
	`8`	`+ ->setRules([`
`9`	`9`	`'@Symfony' =>true,`
`10`	`10`	`'@Symfony:risky' =>true,`
`11`	`11`	`'@PHPUnit48Migration:risky' =>true,`
`12`	`12`	'php_unit_no_expectation_annotation' =>false,// part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
`13`		`-'array_syntax' =>array('syntax' =>'short'),`
	`13`	`+'array_syntax' =>['syntax' =>'short'],`
`14`	`14`	`'fopen_flags' =>false,`
`15`	`15`	`'ordered_imports' =>true,`
`16`	`16`	`'protected_to_private' =>false,`
`17`	`17`	`// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading`
`18`		`-'native_function_invocation' =>array('include' =>array('@compiler_optimized'),'scope' =>'namespaced'),`
	`18`	`+'native_function_invocation' =>['include' =>['@compiler_optimized'],'scope' =>'namespaced'],`
`19`	`19`	`// Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading`
`20`		`-'phpdoc_types_order' =>array('null_adjustment' =>'always_last','sort_algorithm' =>'none'),`
`21`		`-))`
	`20`	`+'phpdoc_types_order' =>['null_adjustment' =>'always_last','sort_algorithm' =>'none'],`
	`21`	`+])`
`22`	`22`	`->setRiskyAllowed(true)`
`23`	`23`	`->setFinder(`
`24`	`24`	`PhpCsFixer\Finder::create()`
`25`	`25`	`->in(__DIR__.'/src')`
`26`		`- ->append(array(__FILE__))`
`27`		`- ->exclude(array(`
	`26`	`+ ->append([__FILE__])`
	`27`	`+ ->exclude([`
`28`	`28`	// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
`29`	`29`	`'Symfony/Component/DependencyInjection/Tests/Fixtures',`
`30`	`30`	`'Symfony/Component/Routing/Tests/Fixtures/dumper',`
`@@ -38,7 +38,7 @@ return PhpCsFixer\Config::create()`
`38`	`38`	`'Symfony/Bundle/FrameworkBundle/Resources/views/Form',`
`39`	`39`	`// explicit trigger_error tests`
`40`	`40`	`'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',`
`41`		`-))`
	`41`	`+])`
`42`	`42`	`// Support for older PHPunit version`
`43`	`43`	`->notPath('Symfony/Bridge/PhpUnit/SymfonyTestsListener.php')`
`44`	`44`	// file content autogenerated by `var_export`

`‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ class ContainerAwareEventManager extends EventManager`
`27`	`27`	`*`
`28`	`28`	`* <event> => <listeners>`
`29`	`29`	`*/`
`30`		`-private$listeners =array();`
`31`		`-private$initialized =array();`
	`30`	`+private$listeners =[];`
	`31`	`+private$initialized =[];`
`32`	`32`	`private$container;`
`33`	`33`
`34`	`34`	`publicfunction__construct(ContainerInterface$container)`

`‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php‎`

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class DoctrineDataCollector extends DataCollector`
`33`	`33`	`/**`
`34`	`34`	`* @var DebugStack[]`
`35`	`35`	`*/`
`36`		`-private$loggers =array();`
	`36`	`+private$loggers =[];`
`37`	`37`
`38`	`38`	`publicfunction__construct(ManagerRegistry$registry)`
`39`	`39`	`{`
`@@ -58,24 +58,24 @@ public function addLogger($name, DebugStack $logger)`
`58`	`58`	`*/`
`59`	`59`	`publicfunctioncollect(Request$request,Response$response,\Exception$exception =null)`
`60`	`60`	`{`
`61`		`-$queries =array();`
	`61`	`+$queries =[];`
`62`	`62`	`foreach ($this->loggersas$name =>$logger) {`
`63`	`63`	`$queries[$name] =$this->sanitizeQueries($name,$logger->queries);`
`64`	`64`	`}`
`65`	`65`
`66`		`-$this->data =array(`
	`66`	`+$this->data =[`
`67`	`67`	`'queries' =>$queries,`
`68`	`68`	`'connections' =>$this->connections,`
`69`	`69`	`'managers' =>$this->managers,`
`70`		`-);`
	`70`	`+];`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`publicfunctionreset()`
`74`	`74`	`{`
`75`		`-$this->data =array();`
	`75`	`+$this->data =[];`
`76`	`76`
`77`	`77`	`foreach ($this->loggersas$logger) {`
`78`		`-$logger->queries =array();`
	`78`	`+$logger->queries =[];`
`79`	`79`	`$logger->currentQuery =0;`
`80`	`80`	`}`
`81`	`81`	`}`
`@@ -133,10 +133,10 @@ private function sanitizeQuery($connectionName, $query)`
`133`	`133`	`{`
`134`	`134`	`$query['explainable'] =true;`
`135`	`135`	`if (null ===$query['params']) {`
`136`		`-$query['params'] =array();`
	`136`	`+$query['params'] =[];`
`137`	`137`	`}`
`138`	`138`	`if (!\is_array($query['params'])) {`
`139`		`-$query['params'] =array($query['params']);`
	`139`	`+$query['params'] =[$query['params']];`
`140`	`140`	`}`
`141`	`141`	`foreach ($query['params']as$j =>$param) {`
`142`	`142`	`if (isset($query['types'][$j])) {`
`@@ -184,26 +184,26 @@ private function sanitizeParam($var)`
`184`	`184`	`$className =\get_class($var);`
`185`	`185`
`186`	`186`	`returnmethod_exists($var,'__toString') ?`
`187`		`-array(sprintf('Object(%s): "%s"',$className,$var->__toString()),false) :`
`188`		`-array(sprintf('Object(%s)',$className),false);`
	`187`	`+[sprintf('Object(%s): "%s"',$className,$var->__toString()),false] :`
	`188`	`+[sprintf('Object(%s)',$className),false];`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`if (\is_array($var)) {`
`192`		`-$a =array();`
	`192`	`+$a =[];`
`193`	`193`	`$original =true;`
`194`	`194`	`foreach ($varas$k =>$v) {`
`195`	`195`	`list($value,$orig) =$this->sanitizeParam($v);`
`196`	`196`	`$original =$original &&$orig;`
`197`	`197`	`$a[$k] =$value;`
`198`	`198`	`}`
`199`	`199`
`200`		`-returnarray($a,$original);`
	`200`	`+return[$a,$original];`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`if (\is_resource($var)) {`
`204`		`-returnarray(sprintf('Resource(%s)',get_resource_type($var)),false);`
	`204`	`+return[sprintf('Resource(%s)',get_resource_type($var)),false];`
`205`	`205`	`}`
`206`	`206`
`207`		`-returnarray($var,true);`
	`207`	`+return[$var,true];`
`208`	`208`	`}`
`209`	`209`	`}`

`‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php‎`

Lines changed: 27 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,12 @@ abstract class AbstractDoctrineExtension extends Extension`
`27`	`27`	`/**`
`28`	`28`	`* Used inside metadata driver method to simplify aggregation of data.`
`29`	`29`	`*/`
`30`		`-protected$aliasMap =array();`
	`30`	`+protected$aliasMap =[];`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* Used inside metadata driver method to simplify aggregation of data.`
`34`	`34`	`*/`
`35`		`-protected$drivers =array();`
	`35`	`+protected$drivers =[];`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* @param array $objectManager A configured object manager`
`@@ -46,10 +46,10 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder`
`46`	`46`	`// automatically register bundle mappings`
`47`	`47`	`foreach (array_keys($container->getParameter('kernel.bundles'))as$bundle) {`
`48`	`48`	`if (!isset($objectManager['mappings'][$bundle])) {`
`49`		`-$objectManager['mappings'][$bundle] =array(`
	`49`	`+$objectManager['mappings'][$bundle] =[`
`50`	`50`	`'mapping' =>true,`
`51`	`51`	`'is_bundle' =>true,`
`52`		`-);`
	`52`	`+];`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
`@@ -59,11 +59,11 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder`
`59`	`59`	`continue;`
`60`	`60`	`}`
`61`	`61`
`62`		`-$mappingConfig =array_replace(array(`
	`62`	`+$mappingConfig =array_replace([`
`63`	`63`	`'dir' =>false,`
`64`	`64`	`'type' =>false,`
`65`	`65`	`'prefix' =>false,`
`66`		`-), (array)$mappingConfig);`
	`66`	`+], (array)$mappingConfig);`
`67`	`67`
`68`	`68`	`$mappingConfig['dir'] =$container->getParameterBag()->resolveValue($mappingConfig['dir']);`
`69`	`69`	`// a bundle configuration is detected by realizing that the specified dir is not absolute and existing`
`@@ -153,7 +153,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`if (!$bundleConfig['dir']) {`
`156`		`-if (\in_array($bundleConfig['type'],array('annotation','staticphp'))) {`
	`156`	`+if (\in_array($bundleConfig['type'],['annotation','staticphp'])) {`
`157`	`157`	`$bundleConfig['dir'] =$bundleDir.'/'.$this->getMappingObjectDefaultName();`
`158`	`158`	`}else {`
`159`	`159`	`$bundleConfig['dir'] =$bundleDir.'/'.$this->getMappingResourceConfigDirectory();`
`@@ -197,25 +197,25 @@ protected function registerMappingDrivers($objectManager, ContainerBuilder $cont`
`197`	`197`	`}`
`198`	`198`	`$mappingDriverDef->setArguments($args);`
`199`	`199`	`}elseif ('annotation' ==$driverType) {`
`200`		`-$mappingDriverDef =newDefinition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'),array(`
	`200`	`+$mappingDriverDef =newDefinition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'),[`
`201`	`201`	`newReference($this->getObjectManagerElementName('metadata.annotation_reader')),`
`202`	`202`	`array_values($driverPaths),`
`203`		`-));`
	`203`	`+]);`
`204`	`204`	`}else {`
`205`		`-$mappingDriverDef =newDefinition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'),array(`
	`205`	`+$mappingDriverDef =newDefinition('%'.$this->getObjectManagerElementName('metadata.'.$driverType.'.class%'),[`
`206`	`206`	`array_values($driverPaths),`
`207`		`-));`
	`207`	`+]);`
`208`	`208`	`}`
`209`	`209`	`$mappingDriverDef->setPublic(false);`
`210`	`210`	`if (false !==strpos($mappingDriverDef->getClass(),'yml') \|\|false !==strpos($mappingDriverDef->getClass(),'xml')) {`
`211`		`-$mappingDriverDef->setArguments(array(array_flip($driverPaths)));`
`212`		`-$mappingDriverDef->addMethodCall('setGlobalBasename',array('mapping'));`
	`211`	`+$mappingDriverDef->setArguments([array_flip($driverPaths)]);`
	`212`	`+$mappingDriverDef->addMethodCall('setGlobalBasename',['mapping']);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`$container->setDefinition($mappingService,$mappingDriverDef);`
`216`	`216`
`217`	`217`	`foreach ($driverPathsas$prefix =>$driverPath) {`
`218`		`-$chainDriverDef->addMethodCall('addDriver',array(newReference($mappingService),$prefix));`
	`218`	`+$chainDriverDef->addMethodCall('addDriver',[newReference($mappingService),$prefix]);`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`@@ -240,7 +240,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object`
`240`	`240`	`thrownew \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.',$mappingConfig['dir']));`
`241`	`241`	`}`
`242`	`242`
`243`		`-if (!\in_array($mappingConfig['type'],array('xml','yml','annotation','php','staticphp'))) {`
	`243`	`+if (!\in_array($mappingConfig['type'],['xml','yml','annotation','php','staticphp'])) {`
`244`	`244`	`thrownew \InvalidArgumentException(sprintf('Can only configure "xml", "yml", "annotation", "php" or'.`
`245`	`245`	`'"staticphp" through the DoctrineBundle. Use your own bundle to configure other metadata drivers.'.`
`246`	`246`	`'You can register them by adding a new driver to the'.`
`@@ -326,11 +326,11 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD`
`326`	`326`	`$cacheDef =newDefinition($memcacheClass);`
`327`	`327`	`$memcacheInstance =newDefinition($memcacheInstanceClass);`
`328`	`328`	`$memcacheInstance->setPrivate(true);`
`329`		`-$memcacheInstance->addMethodCall('connect',array(`
	`329`	`+$memcacheInstance->addMethodCall('connect',[`
`330`	`330`	`$memcacheHost,$memcachePort,`
`331`		`-));`
	`331`	`+]);`
`332`	`332`	`$container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcache_instance',$objectManagerName)),$memcacheInstance);`
`333`		`-$cacheDef->addMethodCall('setMemcache',array(newReference($this->getObjectManagerElementName(sprintf('%s_memcache_instance',$objectManagerName)))));`
	`333`	`+$cacheDef->addMethodCall('setMemcache',[newReference($this->getObjectManagerElementName(sprintf('%s_memcache_instance',$objectManagerName)))]);`
`334`	`334`	`break;`
`335`	`335`	`case'memcached':`
`336`	`336`	`$memcachedClass = !empty($cacheDriver['class']) ?$cacheDriver['class'] :'%'.$this->getObjectManagerElementName('cache.memcached.class').'%';`
`@@ -340,11 +340,11 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD`
`340`	`340`	`$cacheDef =newDefinition($memcachedClass);`
`341`	`341`	`$memcachedInstance =newDefinition($memcachedInstanceClass);`
`342`	`342`	`$memcachedInstance->setPrivate(true);`
`343`		`-$memcachedInstance->addMethodCall('addServer',array(`
	`343`	`+$memcachedInstance->addMethodCall('addServer',[`
`344`	`344`	`$memcachedHost,$memcachedPort,`
`345`		`-));`
	`345`	`+]);`
`346`	`346`	`$container->setDefinition($this->getObjectManagerElementName(sprintf('%s_memcached_instance',$objectManagerName)),$memcachedInstance);`
`347`		`-$cacheDef->addMethodCall('setMemcached',array(newReference($this->getObjectManagerElementName(sprintf('%s_memcached_instance',$objectManagerName)))));`
	`347`	`+$cacheDef->addMethodCall('setMemcached',[newReference($this->getObjectManagerElementName(sprintf('%s_memcached_instance',$objectManagerName)))]);`
`348`	`348`	`break;`
`349`	`349`	`case'redis':`
`350`	`350`	`$redisClass = !empty($cacheDriver['class']) ?$cacheDriver['class'] :'%'.$this->getObjectManagerElementName('cache.redis.class').'%';`
`@@ -354,11 +354,11 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD`
`354`	`354`	`$cacheDef =newDefinition($redisClass);`
`355`	`355`	`$redisInstance =newDefinition($redisInstanceClass);`
`356`	`356`	`$redisInstance->setPrivate(true);`
`357`		`-$redisInstance->addMethodCall('connect',array(`
	`357`	`+$redisInstance->addMethodCall('connect',[`
`358`	`358`	`$redisHost,$redisPort,`
`359`		`-));`
	`359`	`+]);`
`360`	`360`	`$container->setDefinition($this->getObjectManagerElementName(sprintf('%s_redis_instance',$objectManagerName)),$redisInstance);`
`361`		`-$cacheDef->addMethodCall('setRedis',array(newReference($this->getObjectManagerElementName(sprintf('%s_redis_instance',$objectManagerName)))));`
	`361`	`+$cacheDef->addMethodCall('setRedis',[newReference($this->getObjectManagerElementName(sprintf('%s_redis_instance',$objectManagerName)))]);`
`362`	`362`	`break;`
`363`	`363`	`case'apc':`
`364`	`364`	`case'apcu':`
`@@ -387,7 +387,7 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD`
`387`	`387`	`$cacheDriver['namespace'] =$namespace;`
`388`	`388`	`}`
`389`	`389`
`390`		`-$cacheDef->addMethodCall('setNamespace',array($cacheDriver['namespace']));`
	`390`	`+$cacheDef->addMethodCall('setNamespace',[$cacheDriver['namespace']]);`
`391`	`391`
`392`	`392`	`$container->setDefinition($cacheDriverServiceId,$cacheDef);`
`393`	`393`
`@@ -410,10 +410,10 @@ protected function fixManagersAutoMappings(array $managerConfigs, array $bundles`
`410`	`410`	`continue2;`
`411`	`411`	`}`
`412`	`412`	`}`
`413`		`-$managerConfigs[$autoMappedManager]['mappings'][$bundle] =array(`
	`413`	`+$managerConfigs[$autoMappedManager]['mappings'][$bundle] =[`
`414`	`414`	`'mapping' =>true,`
`415`	`415`	`'is_bundle' =>true,`
`416`		`-);`
	`416`	`+];`
`417`	`417`	`}`
`418`	`418`	`$managerConfigs[$autoMappedManager]['auto_mapping'] =false;`
`419`	`419`	`}`

`‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,13 @@ private function addTaggedSubscribers(ContainerBuilder $container)`
`65`	`65`
`66`	`66`	`foreach ($taggedSubscribersas$taggedSubscriber) {`
`67`	`67`	`list($id,$tag) =$taggedSubscriber;`
`68`		`-$connections =isset($tag['connection']) ?array($tag['connection']) :array_keys($this->connections);`
	`68`	`+$connections =isset($tag['connection']) ?[$tag['connection']] :array_keys($this->connections);`
`69`	`69`	`foreach ($connectionsas$con) {`
`70`	`70`	`if (!isset($this->connections[$con])) {`
`71`	`71`	`thrownewRuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s',$con,$id,implode(',',array_keys($this->connections))));`
`72`	`72`	`}`
`73`	`73`
`74`		`-$this->getEventManagerDef($container,$con)->addMethodCall('addEventSubscriber',array(newReference($id)));`
	`74`	`+$this->getEventManagerDef($container,$con)->addMethodCall('addEventSubscriber',[newReference($id)]);`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
`@@ -88,7 +88,7 @@ private function addTaggedListeners(ContainerBuilder $container)`
`88`	`88`	`thrownewInvalidArgumentException(sprintf('Doctrine event listener "%s" must specify the "event" attribute.',$id));`
`89`	`89`	`}`
`90`	`90`
`91`		`-$connections =isset($tag['connection']) ?array($tag['connection']) :array_keys($this->connections);`
	`91`	`+$connections =isset($tag['connection']) ?[$tag['connection']] :array_keys($this->connections);`
`92`	`92`	`foreach ($connectionsas$con) {`
`93`	`93`	`if (!isset($this->connections[$con])) {`
`94`	`94`	`thrownewRuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s',$con,$id,implode(',',array_keys($this->connections))));`
`@@ -99,7 +99,7 @@ private function addTaggedListeners(ContainerBuilder $container)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`// we add one call per event per service so we have the correct order`
`102`		`-$this->getEventManagerDef($container,$con)->addMethodCall('addEventListener',array(array($tag['event']),$lazy ?$id :newReference($id)));`
	`102`	`+$this->getEventManagerDef($container,$con)->addMethodCall('addEventListener',[[$tag['event']],$lazy ?$id :newReference($id)]);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`@@ -130,12 +130,12 @@ private function getEventManagerDef(ContainerBuilder $container, $name)`
`130`	`130`	`*/`
`131`	`131`	`privatefunctionfindAndSortTags($tagName,ContainerBuilder$container)`
`132`	`132`	`{`
`133`		`-$sortedTags =array();`
	`133`	`+$sortedTags =[];`
`134`	`134`
`135`	`135`	`foreach ($container->findTaggedServiceIds($tagName,true)as$serviceId =>$tags) {`
`136`	`136`	`foreach ($tagsas$attributes) {`
`137`	`137`	`$priority =isset($attributes['priority']) ?$attributes['priority'] :0;`
`138`		`-$sortedTags[$priority][] =array($serviceId,$attributes);`
	`138`	`+$sortedTags[$priority][] =[$serviceId,$attributes];`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`

`‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface`
`117`	`117`	`* register alias`
`118`	`118`	`* @param string[] $aliasMap Map of alias to namespace`
`119`	`119`	`*/`
`120`		`-publicfunction__construct($driver,array$namespaces,array$managerParameters,$driverPattern,$enabledParameter =false,$configurationPattern ='',$registerAliasMethodName ='',array$aliasMap =array())`
	`120`	`+publicfunction__construct($driver,array$namespaces,array$managerParameters,$driverPattern,$enabledParameter =false,$configurationPattern ='',$registerAliasMethodName ='',array$aliasMap =[])`
`121`	`121`	`{`
`122`	`122`	`$this->driver =$driver;`
`123`	`123`	`$this->namespaces =$namespaces;`
`@@ -146,7 +146,7 @@ public function process(ContainerBuilder $container)`
`146`	`146`	`// Definition for a Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain`
`147`	`147`	`$chainDriverDef =$container->getDefinition($chainDriverDefService);`
`148`	`148`	`foreach ($this->namespacesas$namespace) {`
`149`		`-$chainDriverDef->addMethodCall('addDriver',array($mappingDriverDef,$namespace));`
	`149`	`+$chainDriverDef->addMethodCall('addDriver',[$mappingDriverDef,$namespace]);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`if (!\count($this->aliasMap)) {`
`@@ -157,7 +157,7 @@ public function process(ContainerBuilder $container)`
`157`	`157`	`// Definition of the Doctrine\...\Configuration class specific to the Doctrine flavour.`
`158`	`158`	`$configurationServiceDefinition =$container->getDefinition($configurationServiceName);`
`159`	`159`	`foreach ($this->aliasMapas$alias =>$namespace) {`
`160`		`-$configurationServiceDefinition->addMethodCall($this->registerAliasMethodName,array($alias,$namespace));`
	`160`	`+$configurationServiceDefinition->addMethodCall($this->registerAliasMethodName,[$alias,$namespace]);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit33a001e

File tree

2,234 files changed

Some content is hidden

2,234 files changed

`‎.php_cs.dist‎`

`‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php‎`

`‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php‎`

`‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php‎`

`‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php‎`

`‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php‎`

0 commit comments