Merge pull request #4 from ibrahimgunduz34/fix/ci-config

Fix/ci config
ibrahimgunduz34 · Nov 30, 2019 · bed4d32 · bed4d32
2 parents 74cea03 + ae8c74f
commit bed4d32
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 34 deletions.
diff --git a/.travis.yaml b/.travis.yaml
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,17 @@
+language: php
+
+php:
+#  - 7.4
+  - 7.3
+  - 7.2
+  - 7.1
+#  - 7.0
+#  - 5.6
+
+before_script:
+  - phpenv rehash
+  - composer install --dev
+
+script:
+#  - find ./src/ -name "*.php" -exec php -l {} \;
+  - vendor/bin/phpunit
diff --git a/Matcher/MatcherFactory.php b/Matcher/MatcherFactory.php
@@ -35,7 +35,9 @@ public function create($scenarioRules)
                 self::MATCHER_FIRST,
                 self::MATCHER_LAST
             ];
-            if (!in_array(strtolower(reset(array_keys($scenarioRules))), $matchers)) {
+
+            $matchersInScenario = array_keys($scenarioRules);
+            if (!in_array(strtolower(reset($matchersInScenario)), $matchers)) {
                 $scenarioRules = ['default' => $scenarioRules];
             }
         }
@@ -50,7 +52,8 @@ public function create($scenarioRules)
     private function createMatcher($scenarioRules)
     {
         $rules = reset($scenarioRules);
-        $matcherType = reset(array_keys($scenarioRules));
+        $keys = array_keys($scenarioRules);
+        $matcherType = reset($keys);
         $operator = $this->operatorFactory->create($rules);
 
         switch ($matcherType) {

diff --git a/Operator/OperatorFactory.php b/Operator/OperatorFactory.php
@@ -32,7 +32,8 @@ private function createComparisionOperator($field, $condition)
         if (count($condition) > 1) {
             throw new InvalidConfigurationException(sprintf('Invalid rule definition %s => %s', $field, $condition));
         }
-        $operatorType = reset(array_keys($condition));
+        $operatorTypes = array_keys($condition);
+        $operatorType = reset($operatorTypes);
         $value = $condition[$operatorType];
 
         switch ($operatorType) {

diff --git a/Resources/config/maria.yaml b/Resources/config/maria.yaml
@@ -14,7 +14,7 @@ parameters:
   maria.matcher.last.class: SweetCode\MariaBundle\Matcher\LastMatcher
   maria.matcher.none.class: SweetCode\MariaBundle\Matcher\NoneMatcher
 
-  maria.service_factory.matcher.class: SweetCode\MariaBundle\MAtcher\MatcherFactory
+  maria.service_factory.matcher.class: SweetCode\MariaBundle\Matcher\MatcherFactory
   maria.service_factory.operator.class: SweetCode\MariaBundle\Operator\OperatorFactory
 
 services:

diff --git a/Tests/DependencyInjection/MariaExtensionTest.php b/Tests/DependencyInjection/MariaExtensionTest.php
@@ -1,6 +1,7 @@
 <?php
 namespace SweetCode\MariaBundle\Tests;
 
+use PHPUnit\Exception;
 use PHPUnit\Framework\TestCase;
 use SweetCode\MariaBundle\DependencyInjection\MariaExtension;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -38,12 +39,13 @@ public function testTriggerAndActionEvents()
         $triggerEvent = $container->getDefinition($triggerEventServiceId);
         $this->assertEquals('%maria.event_listener.trigger.class%', $triggerEvent->getClass());
         $this->assertTrue($triggerEvent->hasTag('kernel.event_listener'));
+        $tag = $triggerEvent->getTag('kernel.event_listener');
         $this->assertEquals(
             [
                 'event' => 'test.event',
                 'method' => 'onTrigger'
             ],
-            reset($triggerEvent->getTag('kernel.event_listener'))
+            reset($tag)
         );
 
         $actionHandlerId = 'maria.handler.test_scenario.SweetCode\MariaBundle\Tests\Stub\ValidActionHandler';
@@ -53,9 +55,12 @@ public function testTriggerAndActionEvents()
 
     public function testActionEventImplementationValidation()
     {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectDeprecationMessage(
-            'Handler class needs to implement onAction method');
-        $this->getContainer('bad_action_event_implementation.yaml');
+        try {
+            $this->getContainer('bad_action_event_implementation.yaml');
+        } catch (\Exception $exception) {
+            $this->assertInstanceOf(InvalidConfigurationException::class, $exception);
+            $this->assertEquals('Handler class needs to implement onAction method', $exception->getMessage());
+        }
+
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,11 +8,12 @@
         convertWarningsToExceptions = "true"
         processIsolation            = "false"
         stopOnFailure               = "false"
-        syntaxCheck                 = "false"
         bootstrap                   = "./vendor/autoload.php">
-    <testsuite>
-        <directory>Tests</directory>
-    </testsuite>
+    <testsuites>
+        <testsuite name="MariaBundle">
+            <directory>Tests</directory>
+        </testsuite>
+    </testsuites>
 
     <filter>
         <whitelist>