Merge branch '2.3'

keradus · keradus · commit 4649ba92f051 · 2017-06-02T11:08:53.000+02:00
diff --git a/benchmark.sh b/benchmark.sh
@@ -15,7 +15,7 @@ do
     git checkout $BRANCH &> /dev/null &&
     git reset --hard &> /dev/null &&
     echo -n $BRANCH
-    (for i in {1..10}; do php php-cs-fixer fix . ; done) | grep -i fixed | awk '
+    (for i in {1..10}; do php php-cs-fixer fix --dry-run 2> /dev/null ; done) | grep -i seconds | awk '
     {
         total += $5;
         ++count;
diff --git a/src/Fixer/Casing/MagicConstantCasingFixer.php b/src/Fixer/Casing/MagicConstantCasingFixer.php
@@ -74,11 +74,8 @@ private function getMagicConstants()
                 T_METHOD_C => '__METHOD__',
                 T_NS_C => '__NAMESPACE__',
                 CT::T_CLASS_CONSTANT => 'class',
+                T_TRAIT_C => '__TRAIT__',
             ];
-
-            if (defined('T_TRAIT_C')) {
-                $magicConstants[T_TRAIT_C] = '__TRAIT__';
-            }
         }
 
         return $magicConstants;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ do`
`15`	`15`	`git checkout $BRANCH &> /dev/null &&`
`16`	`16`	`git reset --hard &> /dev/null &&`
`17`	`17`	`echo -n $BRANCH`
`18`		`- (for i in {1..10}; do php php-cs-fixer fix . ; done) \| grep -i fixed \| awk '`
	`18`	`+ (for i in {1..10}; do php php-cs-fixer fix --dry-run 2> /dev/null ; done) \| grep -i seconds \| awk '`
`19`	`19`	`{`
`20`	`20`	`total += $5;`
`21`	`21`	`++count;`