Merge pull request #14 from playox/#2/master/add-annotations-v2

#2 - adding annotations v2 to composer.json
playox · Nov 28, 2023 · f3945b5 · f3945b5
2 parents dfdb097 + d17051a
commit f3945b5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -10,15 +10,19 @@ jobs:
     build:
         strategy:
             matrix:
-                php: ['7.2','7.3','7.4','8.0', '8.1']
+                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
                 symfony: ['5.4', '6.3']
                 exclude:
                   - php: 7.2
                     symfony: 6.3
                   - php: 7.3
                     symfony: 6.3
+                  - php: 7.3
+                    symfony: 7.0
                   - php: 7.4
                     symfony: 6.3
+                  - php: 7.4
+                    symfony: 7.0
                   - php: 8.0
                     symfony: 6.3
 

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "symfony/config": "^4.4 | ^5.0 | ^6.0",
     "symfony/http-kernel": "^4.4 | ^5.0 | ^6.0",
     "twig/twig": "^1.18|^2.0|^3.0",
-    "doctrine/annotations": "^1.7",
+    "doctrine/annotations": "^1.7 | ^2.0",
     "flagception/flagception": "^1.5"
   },
   "require-dev": {

diff --git a/src/Profiler/FeatureDataCollector.php b/src/Profiler/FeatureDataCollector.php
@@ -156,7 +156,7 @@ public function getRequests(): array
      */
     public function getActivators(): array
     {
-        return $this->data['activators'];
+        return $this->data['activators'] ?? [];
     }
 
     /**
@@ -166,7 +166,7 @@ public function getActivators(): array
      */
     public function getDecorators(): array
     {
-        return $this->data['decorators'];
+        return $this->data['decorators'] ?? [];
     }
 
     /**
@@ -176,7 +176,7 @@ public function getDecorators(): array
      */
     public function getTrace(): array
     {
-        return $this->data['trace'];
+        return $this->data['trace'] ?? [];
     }
 
     /**
@@ -186,7 +186,7 @@ public function getTrace(): array
      */
     public function getSummary(): array
     {
-        return $this->data['summary'];
+        return $this->data['summary'] ?? [];
     }
 
     /**

diff --git a/tests/DependencyInjection/Configurator/DatabaseConfiguratorTest.php b/tests/DependencyInjection/Configurator/DatabaseConfiguratorTest.php
@@ -4,7 +4,6 @@
 
 use Flagception\Bundle\FlagceptionBundle\DependencyInjection\Configurator\DatabaseConfigurator;
 use Flagception\Bundle\FlagceptionBundle\DependencyInjection\FlagceptionExtension;
-use LogicException;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/tests/Profiler/FeatureDataCollectorTest.php b/tests/Profiler/FeatureDataCollectorTest.php
@@ -41,6 +41,7 @@ public function testReset()
     {
         $collector = new FeatureDataCollector(new TraceableChainActivator(), new ChainDecorator());
         $collector->reset();
+        static::assertEquals([], $collector->getActivators());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ public function testReset() @@
         {
             $collector = new FeatureDataCollector(new TraceableChainActivator(), new ChainDecorator());
             $collector->reset();
+            static::assertEquals([], $collector->getActivators());
         }
         /**
@@ Expand Down @@