Merge branch '2.7' into 2.8

fabpot · fabpot · commit c349d6e77a6f · 2016-09-12T11:14:50.000-07:00
* 2.7:
  [travis/appveyor] Wire simple-phpunit
  [Console] fixed PHP7 Errors are now handled and converted to Exceptions
  Fix #19721
  bumped Symfony version to 2.7.19
  updated VERSION for 2.7.18
  update CONTRIBUTORS for 2.7.18
  updated CHANGELOG for 2.7.18
  [Security] Optimize RoleHierarchy's buildRoleMap method
diff --git a/Role/RoleHierarchy.php b/Role/RoleHierarchy.php
@@ -65,9 +65,17 @@ protected function buildRoleMap()
                 }
 
                 $visited[] = $role;
-                $this->map[$main] = array_unique(array_merge($this->map[$main], $this->hierarchy[$role]));
-                $additionalRoles = array_merge($additionalRoles, array_diff($this->hierarchy[$role], $visited));
+
+                foreach ($this->hierarchy[$role] as $roleToAdd) {
+                    $this->map[$main][] = $roleToAdd;
+                }
+
+                foreach (array_diff($this->hierarchy[$role], $visited) as $additionalRole) {
+                    $additionalRoles[] = $additionalRole;
+                }
             }
+
+            $this->map[$main] = array_unique($this->map[$main]);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,17 @@ protected function buildRoleMap()`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`$visited[] = $role;`
`68`		`- $this->map[$main] = array_unique(array_merge($this->map[$main], $this->hierarchy[$role]));`
`69`		`- $additionalRoles = array_merge($additionalRoles, array_diff($this->< 82F3 span class=pl-c1>hierarchy[$role], $visited));`
	`68`	`+`
	`69`	`+ foreach ($this->hierarchy[$role] as $roleToAdd) {`
	`70`	`+ $this->map[$main][] = $roleToAdd;`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ foreach (array_diff($this->hierarchy[$role], $visited) as $additionalRole) {`
	`74`	`+ $additionalRoles[] = $additionalRole;`
	`75`	`+ }`
`70`	`76`	`}`
	`77`	`+`
	`78`	`+ $this->map[$main] = array_unique($this->map[$main]);`
`71`	`79`	`}`
`72`	`80`	`}`
`73`	`81`	`}`