Merge pull request #16 from pamil/things

Maintenance PR

Author: pamil

.travis.yml

@@ -2,12 +2,7 @@ language: php
 
 php:
     - 7.1
-    - nightly
-
-matrix:
-    allow_failures:
-        - php: nightly
-    fast_finish: true
+    - 7.2
 
 cache:
     directories:
@@ -22,5 +17,7 @@ install:
 script:
     - composer validate --strict
 
+    - vendor/bin/ecs check src spec
+
     - vendor/bin/phpspec run --format dot -vvv --no-interaction
     - vendor/bin/behat --strict -vvv --no-interaction

composer.json

@@ -13,17 +13,18 @@
         "php": "^7.1",
 
         "behat/behat": "^3.1",
-        "symfony/dependency-injection": "^2.8|^3.0"
+        "symfony/dependency-injection": "^3.0"
     },
     "require-dev": {
-        "friends-of-behat/test-context": "^1.0",
         "friends-of-behat/cross-container-extension": "^1.0",
-        "phpspec/phpspec": "^4.0@alpha"
+        "friends-of-behat/test-context": "^1.0",
+        "phpspec/phpspec": "^4.0",
+        "sylius-labs/coding-standard": "^1.0"
     },
     "suggest": {
         "friends-of-behat/cross-container-extension": "^1.0",
-        "ocramius/proxy-manager": "^1.0|^2.0",
-        "symfony/proxy-manager-bridge": "^2.8|^3.0"
+        "ocramius/proxy-manager": "^2.0",
+        "symfony/proxy-manager-bridge": "^3.0"
     },
     "autoload": {
         "psr-4": { "FriendsOfBehat\\ContextServiceExtension\\": "src/" }

easy-coding-standard.neon

@@ -0,0 +1,9 @@
+includes:
+    - vendor/sylius-labs/coding-standard/easy-coding-standard.neon
+
+checkers:
+    PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer:
+        equal: false
+        identical: false
+        less_and_greater: false
+    SlevomatCodingStandard\Sniffs\Classes\UnusedPrivateElementsSniff: {}

src/Context/Environment/Handler/ContextServiceEnvironmentHandler.php

@@ -165,5 +165,4 @@ public function registerContextInitializer(ContextInitializer $initializer)
     {
         $this->contextInitializers[] = $initializer;
     }
-
 }

src/ServiceContainer/ContextServiceExtension.php

@@ -55,7 +55,7 @@ public function initialize(ExtensionManager $extensionManager): void
     {
         /** @var CrossContainerExtension|null $crossContainerExtension */
         $crossContainerExtension = $extensionManager->getExtension('fob_cross_container');
-        if (null !== $crossContainerExtension) {
+        if ($crossContainerExtension !== null) {
             $this->crossContainerProcessor = $crossContainerExtension->getCrossContainerProcessor();
         }
     }
@@ -83,7 +83,6 @@ public function load(ContainerBuilder $container, array $config): void
         $this->loadContextRegistry($container);
         $this->loadScenarioServiceContainer($container, $config);
         $this->loadEnvironmentHandler($container);
-        $this->loadContextInitializers($container);
     }
 
     /**
@@ -94,15 +93,17 @@ public function process(ContainerBuilder $container): void
         /** @var ContainerBuilder $scenarioContainer */
         $scenarioContainer = $container->get('fob_context_service.service_container.scenario');
 
-        if (null !== $this->crossContainerProcessor) {
+        if ($this->crossContainerProcessor !== null) {
             $this->crossContainerProcessor->process($scenarioContainer);
         }
 
         // This feature was introduced only in symfony/dependency-injection v3.3
         // So we are adding the feature for modern containers and leaving as-is for older ones
         if (method_exists($scenarioContainer, 'registerForAutoconfiguration')) {
-            $scenarioContainer->registerForAutoconfiguration(\Behat\Behat\Context\Context::class)
-                ->addTag(ContextRegistryPass::CONTEXT_SERVICE_TAG);
+            $scenarioContainer
+                ->registerForAutoconfiguration(\Behat\Behat\Context\Context::class)
+                ->addTag(ContextRegistryPass::CONTEXT_SERVICE_TAG)
+            ;
         }
 
         $scenarioContainer->addCompilerPass(new ContextRegistryPass($container->getDefinition('fob_context_service.context_registry')));
@@ -146,20 +147,10 @@ private function loadEnvironmentHandler(ContainerBuilder $container): void
         ]);
         $definition->addTag(EnvironmentExtension::HANDLER_TAG, ['priority' => 128]);
 
-        $container->setDefinition('fob_context_service.environment_handler.context_service', $definition);
-    }
-
-    /**
-     * @param ContainerBuilder $container
-     */
-    private function loadContextInitializers(ContainerBuilder $container)
-    {
-        $references = $container->findTaggedServiceIds(ContextExtension::INITIALIZER_TAG);
-
-        $definition = $container->getDefinition('fob_context_service.environment_handler.context_service');
-
-        foreach ($references as $serviceId => $tags) {
+        foreach ($container->findTaggedServiceIds(ContextExtension::INITIALIZER_TAG) as $serviceId => $tags) {
             $definition->addMethodCall('registerContextInitializer', [$container->getDefinition($serviceId)]);
         }
+
+        $container->setDefinition('fob_context_service.environment_handler.context_service', $definition);
     }
 }