Completed
Pull Request — master (#317)
by Leny
80:20 queued 63:15
created
Bundle/PageBundle/Twig/Extension/PageExtension.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
     /**
49 49
      * register twig functions.
50 50
      *
51
-     * @return array The list of extensions
51
+     * @return \Twig_SimpleFunction[] The list of extensions
52 52
      */
53 53
     public function getFunctions()
54 54
     {
Please login to merge, or discard this patch.
Bundle/ViewReferenceBundle/Connector/Redis/ViewReferenceRedisTool.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -96,24 +96,24 @@
 block discarded – undo
96 96
 
97 97
     public static function isSerialized($data) {
98 98
         // if it isn't a string, it isn't serialized
99
-        if ( !is_string( $data ) )
99
+        if (!is_string($data))
100 100
             return false;
101
-        $data = trim( $data );
102
-        if ( 'N;' == $data )
101
+        $data = trim($data);
102
+        if ('N;' == $data)
103 103
             return true;
104
-        if ( !preg_match( '/^([adObis]):/', $data, $badions ) )
104
+        if (!preg_match('/^([adObis]):/', $data, $badions))
105 105
             return false;
106
-        switch ( $badions[1] ) {
106
+        switch ($badions[1]) {
107 107
             case 'a' :
108 108
             case 'O' :
109 109
             case 's' :
110
-                if ( preg_match( "/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data ) )
110
+                if (preg_match("/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data))
111 111
                     return true;
112 112
                 break;
113 113
             case 'b' :
114 114
             case 'i' :
115 115
             case 'd' :
116
-                if ( preg_match( "/^{$badions[1]}:[0-9.E-]+;\$/", $data ) )
116
+                if (preg_match("/^{$badions[1]}:[0-9.E-]+;\$/", $data))
117 117
                     return true;
118 118
                 break;
119 119
         }
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -96,25 +96,30 @@
 block discarded – undo
96 96
 
97 97
     public static function isSerialized($data) {
98 98
         // if it isn't a string, it isn't serialized
99
-        if ( !is_string( $data ) )
100
-            return false;
99
+        if ( !is_string( $data ) ) {
100
+                    return false;
101
+        }
101 102
         $data = trim( $data );
102
-        if ( 'N;' == $data )
103
-            return true;
104
-        if ( !preg_match( '/^([adObis]):/', $data, $badions ) )
105
-            return false;
103
+        if ( 'N;' == $data ) {
104
+                    return true;
105
+        }
106
+        if ( !preg_match( '/^([adObis]):/', $data, $badions ) ) {
107
+                    return false;
108
+        }
106 109
         switch ( $badions[1] ) {
107 110
             case 'a' :
108 111
             case 'O' :
109 112
             case 's' :
110
-                if ( preg_match( "/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data ) )
111
-                    return true;
113
+                if ( preg_match( "/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data ) ) {
114
+                                    return true;
115
+                }
112 116
                 break;
113 117
             case 'b' :
114 118
             case 'i' :
115 119
             case 'd' :
116
-                if ( preg_match( "/^{$badions[1]}:[0-9.E-]+;\$/", $data ) )
117
-                    return true;
120
+                if ( preg_match( "/^{$badions[1]}:[0-9.E-]+;\$/", $data ) ) {
121
+                                    return true;
122
+                }
118 123
                 break;
119 124
         }
120 125
         return false;
Please login to merge, or discard this patch.