Merge pull request php-enqueue#38 from php-enqueue/bundle-fix-extension-priority-ordering

makasim · web-flow · commit 04aa5ceb72d4 · 2017-04-03T18:53:46.000+03:00
[bundle] Fix extensions priority ordering. Must be from high to low.
diff --git a/pkg/enqueue-bundle/DependencyInjection/Compiler/BuildExtensionsPass.php b/pkg/enqueue-bundle/DependencyInjection/Compiler/BuildExtensionsPass.php
@@ -24,7 +24,7 @@ public function process(ContainerBuilder $container)
             }
         }
 
-        ksort($groupByPriority);
+        krsort($groupByPriority, SORT_NUMERIC);
 
         $flatExtensions = [];
         foreach ($groupByPriority as $extension) {
diff --git a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/Compiler/BuildExtensionsPassTest.php b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/Compiler/BuildExtensionsPassTest.php
@@ -73,9 +73,9 @@ public function testShouldOrderExtensionsByPriority()
 
         $orderedExtensions = $extensions->getArgument(0);
 
-        $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[0]);
+        $this->assertEquals(new Reference('foo_extension'), $orderedExtensions[0]);
         $this->assertEquals(new Reference('baz_extension'), $orderedExtensions[1]);
-        $this->assertEquals(new Reference('foo_extension'), $orderedExtensions[2]);
+        $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[2]);
     }
 
     public function testShouldAssumePriorityZeroIfPriorityIsNotSet()
@@ -103,8 +103,8 @@ public function testShouldAssumePriorityZeroIfPriorityIsNotSet()
 
         $orderedExtensions = $extensions->getArgument(0);
 
-        $this->assertEquals(new Reference('baz_extension'), $orderedExtensions[0]);
+        $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[0]);
         $this->assertEquals(new Reference('foo_extension'), $orderedExtensions[1]);
-        $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[2]);
+        $this->assertEquals(new Reference('baz_extension'), $orderedExtensions[2]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function process(ContainerBuilder $container)`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- ksort($groupByPriority);`
	`27`	`+ krsort($groupByPriority, SORT_NUMERIC);`
`28`	`28`
`29`	`29`	`$flatExtensions = [];`
`30`	`30`	`foreach ($groupByPriority as $extension) {`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ public function testShouldOrderExtensionsByPriority()`
`73`	`73`
`74`	`74`	`$orderedExtensions = $extensions->getArgument(0);`
`75`	`75`
`76`		`- $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[0]);`
	`76`	`+ $this->assertEquals(new Reference('foo_extension'), $orderedExtensions[0]);`
`77`	`77`	`$this->assertEquals(new Reference('baz_extension'), $orderedExtensions[1]);`
`78`		`- $this->assertEquals(new Reference('foo_extension'), $orderedExtensions[2]);`
	`78`	`+ $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[2]);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public function testShouldAssumePriorityZeroIfPriorityIsNotSet()`
`@@ -103,8 +103,8 @@ public function testShouldAssumePriorityZeroIfPriorityIsNotSet()`
`103`	`103`
`104`	`104`	`$orderedExtensions = $extensions->getArgument(0);`
`105`	`105`
`106`		`- $this->assertEquals(new Reference('baz_extension'), $orderedExtensions[0]);`
	`106`	`+ $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[0]);`
`107`	`107`	`$this->assertEquals(new Reference('foo_extension'), $orderedExtensions[1]);`
`108`		`- $this->assertEquals(new Reference('bar_extension'), $orderedExtensions[2]);`
	`108`	`+ $this->assertEquals(new Reference('baz_extension'), $orderedExtensions[2]);`
`109`	`109`	`}`
`110`	`110`	`}`