Merge pull request #4 from wakeapp/HUB-316

HUB-316
wakeapp · Dec 11, 2019 · d911334 · d911334
2 parents c121b49 + 00d726e
commit d911334
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.4.5] - 2019-12-11
+### Fixed
+- Fixed priority of normalizers and validators.
+
 ## [0.4.4] - 2019-12-11
 ### Changed
 - Improved performance of `SwaggerCachedConfiguration`.

diff --git a/DependencyInjection/Compiler/SwaggerNormalizerCompilerPass.php b/DependencyInjection/Compiler/SwaggerNormalizerCompilerPass.php
@@ -26,10 +26,15 @@ public function process(ContainerBuilder $container): void
 
         $normalizerQueue = new SplPriorityQueue();
 
-        foreach ($container->findTaggedServiceIds(self::TAG) as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds(self::TAG) as $id => $tags) {
             $validatorReference = new Reference($id);
+            $priority = 0;
 
-            $priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
+            foreach ($tags as $attributes) {
+                if (isset($attributes['priority'])) {
+                    $priority = $attributes['priority'];
+                }
+            }
 
             $normalizerQueue->insert($validatorReference, $priority);
         }

diff --git a/DependencyInjection/Compiler/SwaggerValidatorCompilerPass.php b/DependencyInjection/Compiler/SwaggerValidatorCompilerPass.php
@@ -26,10 +26,15 @@ public function process(ContainerBuilder $container): void
 
         $validatorQueue = new SplPriorityQueue();
 
-        foreach ($container->findTaggedServiceIds(self::TAG) as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds(self::TAG) as $id => $tags) {
             $validatorReference = new Reference($id);
+            $priority = 0;
 
-            $priority = isset($attributes['priority']) ? $attributes['priority'] : 0;
+            foreach ($tags as $attributes) {
+                if (isset($attributes['priority'])) {
+                    $priority = $attributes['priority'];
+                }
+            }
 
             $validatorQueue->insert($validatorReference, $priority);
         }