doctrine / inflector

lib/Doctrine/Common/Inflector/Inflector.php

Spacing +20 added lines, -20 removed lines

@@ -449,7 +449,7 @@ 
     public static function rules(string $type, iterable $rules, bool $reset = false) : void
     {
         foreach ($rules as $rule => $pattern) {
-            if (! is_array($pattern)) {
+            if (!is_array($pattern)) {
                 continue;
             }
 
@@ -461,7 +461,7 @@ 
                     : $pattern + self::${$type}[$rule];
             }
 
-            unset($rules[$rule], self::${$type}['cache' . ucfirst($rule)]);
+            unset($rules[$rule], self::${$type}['cache'.ucfirst($rule)]);
 
             if (isset(self::${$type}['merged'][$rule])) {
                 unset(self::${$type}['merged'][$rule]);
@@ -492,31 +492,31 @@ 
             return self::$cache['pluralize'][$word];
         }
 
-        if (! isset(self::$plural['merged']['irregular'])) {
+        if (!isset(self::$plural['merged']['irregular'])) {
             self::$plural['merged']['irregular'] = self::$plural['irregular'];
         }
 
-        if (! isset(self::$plural['merged']['uninflected'])) {
+        if (!isset(self::$plural['merged']['uninflected'])) {
             self::$plural['merged']['uninflected'] = array_merge(self::$plural['uninflected'], self::$uninflected);
         }
 
-        if (! isset(self::$plural['cacheUninflected']) || ! isset(self::$plural['cacheIrregular'])) {
-            self::$plural['cacheUninflected'] = '(?:' . implode('|', self::$plural['merged']['uninflected']) . ')';
-            self::$plural['cacheIrregular']   = '(?:' . implode('|', array_keys(self::$plural['merged']['irregular'])) . ')';
+        if (!isset(self::$plural['cacheUninflected']) || !isset(self::$plural['cacheIrregular'])) {
+            self::$plural['cacheUninflected'] = '(?:'.implode('|', self::$plural['merged']['uninflected']).')';
+            self::$plural['cacheIrregular']   = '(?:'.implode('|', array_keys(self::$plural['merged']['irregular'])).')';
         }
 
 
-        if (preg_match('/(.*(?:\\b|_))(' . self::$plural['cacheIrregular'] . ')$/i', $tablized_word, $regs)) {
-            $result = $regs[1] . substr($regs[2], 0, 1) . substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1);
+        if (preg_match('/(.*(?:\\b|_))('.self::$plural['cacheIrregular'].')$/i', $tablized_word, $regs)) {
+            $result = $regs[1].substr($regs[2], 0, 1).substr(self::$plural['merged']['irregular'][strtolower($regs[2])], 1);
             if ($tablized_word !== $word) {
                 $camelized_result = self::camelize($result);
-                $result = substr($word, 0, 1) . substr($camelized_result, 1);
+                $result = substr($word, 0, 1).substr($camelized_result, 1);
             }
 
             return self::$cache['pluralize'][$word] = $result;
         }
 
-        if (preg_match('/^(' . self::$plural['cacheUninflected'] . ')$/i', $word, $regs)) {
+        if (preg_match('/^('.self::$plural['cacheUninflected'].')$/i', $word, $regs)) {
             self::$cache['pluralize'][$word] = $word;
 
             return $word;
@@ -546,36 +546,36 @@ 
             return self::$cache['singularize'][$word];
         }
 
-        if (! isset(self::$singular['merged']['uninflected'])) {
+        if (!isset(self::$singular['merged']['uninflected'])) {
             self::$singular['merged']['uninflected'] = array_merge(
                 self::$singular['uninflected'],
                 self::$uninflected
             );
         }
 
-        if (! isset(self::$singular['merged']['irregular'])) {
+        if (!isset(self::$singular['merged']['irregular'])) {
             self::$singular['merged']['irregular'] = array_merge(
                 self::$singular['irregular'],
                 array_flip(self::$plural['irregular'])
             );
         }
 
-        if (! isset(self::$singular['cacheUninflected']) || ! isset(self::$singular['cacheIrregular'])) {
-            self::$singular['cacheUninflected'] = '(?:' . implode('|', self::$singular['merged']['uninflected']) . ')';
-            self::$singular['cacheIrregular']   = '(?:' . implode('|', array_keys(self::$singular['merged']['irregular'])) . ')';
+        if (!isset(self::$singular['cacheUninflected']) || !isset(self::$singular['cacheIrregular'])) {
+            self::$singular['cacheUninflected'] = '(?:'.implode('|', self::$singular['merged']['uninflected']).')';
+            self::$singular['cacheIrregular']   = '(?:'.implode('|', array_keys(self::$singular['merged']['irregular'])).')';
         }
         
-        if (preg_match('/(.*(?:\\b|_))(' . self::$singular['cacheIrregular'] . ')$/i', $tablized_word, $regs)) {
-            $result = $regs[1] . substr($regs[2], 0, 1) . substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1);
+        if (preg_match('/(.*(?:\\b|_))('.self::$singular['cacheIrregular'].')$/i', $tablized_word, $regs)) {
+            $result = $regs[1].substr($regs[2], 0, 1).substr(self::$singular['merged']['irregular'][strtolower($regs[2])], 1);
 
             if ($tablized_word !== $word) {
                 $camelized_result = self::camelize($result);
-                $result = substr($word, 0, 1) . substr($camelized_result, 1);
+                $result = substr($word, 0, 1).substr($camelized_result, 1);
             }
             return self::$cache['singularize'][$word] = $result;
         }
 
-        if (preg_match('/^(' . self::$singular['cacheUninflected'] . ')$/i', $word, $regs)) {
+        if (preg_match('/^('.self::$singular['cacheUninflected'].')$/i', $word, $regs)) {
             self::$cache['singularize'][$word] = $word;
 
             return $word;