PHP CS

Author: SmetDenis

src/Filter.php

@@ -410,10 +410,12 @@ public static function className($input)
      */
     public static function stripQuotes($value)
     {
-        if (($value[0] === '"' && substr($value, -1) === '"') ||
-            ($value[0] === "'" && substr($value, -1) === "'")
-        ) {
-            return substr($value, 1, -1);
+        if ($value[0] === '"' && substr($value, -1) === '"') {
+            $value = trim($value, '"');
+        }
+
+        if ($value[0] === "'" && substr($value, -1) === "'") {
+            $value = trim($value, "'");
         }
 
         return $value;

src/Vars.php

@@ -245,21 +245,21 @@ public static function out($number, $min, $max)
     /**
      * Get relative percent
      *
-     * @param float $current
      * @param float $normal
+     * @param float $current
      * @return string
      */
-    public static function relativePercent($current, $normal)
+    public static function relativePercent($normal, $current)
     {
-        $current = (float)$current;
         $normal  = (float)$normal;
+        $current = (float)$current;
 
-        if (!$current) {
-            return '~';
+        if (!$normal || $normal == $current) {
+            return '100';
 
         } else {
-            $current = abs($current);
-            $percent = round($normal / $current * 100);
+            $normal  = abs($normal);
+            $percent = round($current / $normal * 100);
 
             return number_format($percent, 0, '.', ' ');
         }

tests/FilterTest.php

@@ -331,4 +331,20 @@ public function testClassname()
         isSame('Class123Name456', Filter::className('CLASS123NAME456'));
         isSame('Classname', Filter::className('CLASSNAME'));
     }
+
+    public function tstStripQuotes()
+    {
+        isSame('qwerty', Filter::stripQuotes('qwerty'));
+        isSame('qwerty"', Filter::stripQuotes('qwerty"'));
+        isSame('"qwerty', Filter::stripQuotes('"qwerty'));
+        isSame('"qwerty"', Filter::stripQuotes('"qwerty"'));
+
+        isSame("qwerty", Filter::stripQuotes('qwerty'));
+        isSame("qwerty'", Filter::stripQuotes('qwerty\''));
+        isSame("'qwerty", Filter::stripQuotes('\'qwerty'));
+        isSame("'qwerty'", Filter::stripQuotes('\'qwerty\''));
+
+        isSame("'qwerty\"", Filter::stripQuotes('\'qwerty"'));
+        isSame("\"qwerty'", Filter::stripQuotes('"qwerty\''));
+    }
 }

tests/VarsTest.php

@@ -157,6 +157,6 @@ public function testRelativePercent()
         isSame('100', Vars::relativePercent(100, 100));
         isSame('10 000', Vars::relativePercent(1, 100));
         isSame('1', Vars::relativePercent(100, 1));
-        isSame('~', Vars::relativePercent(0, 1));
+        isSame('100', Vars::relativePercent(0, 1));
     }
 }