Merge remote-tracking branch 'origin/2.0'

Author: dbu

src/Templating/Helper/CmfHelper.php

@@ -345,7 +345,7 @@ public function getChildren($parent, $limit = false, $offset = false, $filter =
         $children = (array) $node->getNodeNames();
         foreach ($children as $key => $child) {
             // filter before fetching data already to save some traffic
-            if (strpos($child, 'phpcr_locale:') === 0) {
+            if (0 === strpos($child, 'phpcr_locale:')) {
                 unset($children[$key]);
 
                 continue;
@@ -363,7 +363,7 @@ public function getChildren($parent, $limit = false, $offset = false, $filter =
         $result = [];
         foreach ($children as $name => $child) {
             // if we requested all children above, we did not filter yet
-            if (strpos($name, 'phpcr_locale:') === 0) {
+            if (0 === strpos($name, 'phpcr_locale:')) {
                 continue;
             }
 
@@ -460,7 +460,7 @@ private function getChildrenPaths($path, array &$children, $depth)
         $node = $this->getDm()->getPhpcrSession()->getNode($path);
         $names = (array) $node->getNodeNames();
         foreach ($names as $name) {
-            if (strpos($name, 'phpcr_locale:') === 0) {
+            if (0 === strpos($name, 'phpcr_locale:')) {
                 continue;
             }
 
@@ -504,7 +504,7 @@ public function getDescendants($parent, $depth = null)
     private function checkChildren(array $childNames, $path, $ignoreRole = false, $class = null)
     {
         foreach ($childNames as $name) {
-            if (strpos($name, 'phpcr_locale:') === 0) {
+            if (0 === strpos($name, 'phpcr_locale:')) {
                 continue;
             }
 

tests/Functional/Form/CheckboxUrlLabelFormTypeTest.php

@@ -77,8 +77,8 @@ protected function assertMatchesXpath($html, $expression, $count = 1)
             $this->fail(sprintf(
                 "Failed asserting that \n\n%s\n\nmatches exactly %s. Matches %s in \n\n%s",
                 $expression,
-                $count === 1 ? 'once' : $count.' times',
-                $nodeList->length === 1 ? 'once' : $nodeList->length.' times',
+                1 === $count ? 'once' : $count.' times',
+                1 === $nodeList->length ? 'once' : $nodeList->length.' times',
                 // strip away <root> and </root>
                 substr($dom->saveHTML(), 6, -8)
             ));