Completed
Pull Request — master (#315)
by Oliver
02:12
created
src/Core/Compiler/TemplateCompiler.php 7 patches
Doc Comments   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -369,6 +369,4 @@
 block discarded – undo
369 369
             $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10);
370 370
         }
371 371
         $closure .= '}';
372
-        return $closure;
373
-    }
374
-}
372
+        return $closure
375 373
\ No newline at end of file
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -369,6 +369,4 @@
 block discarded – undo
369 369
             $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10);
370 370
         }
371 371
         $closure .= '}';
372
-        return $closure;
373
-    }
374
-}
372
+        return $closure
375 373
\ No newline at end of file
Please login to merge, or discard this patch.
Indentation   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -369,6 +369,4 @@
 block discarded – undo
369 369
             $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10);
370 370
         }
371 371
         $closure .= '}';
372
-        return $closure;
373
-    }
374
-}
372
+        return $closure
375 373
\ No newline at end of file
Please login to merge, or discard this patch.
Switch Indentation   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -369,6 +369,4 @@
 block discarded – undo
369 369
             $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10);
370 370
         }
371 371
         $closure .= '}';
372
-        return $closure;
373
-    }
374
-}
372
+        return $closure
375 373
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
         if (!$this->renderingContext->isCacheEnabled()) {
151 151
             return false;
152 152
         }
153
-<<<<<<< HEAD
153
+<< << <<< HEAD
154 154
         $identifier = $this->sanitizeIdentifier($identifier);
155 155
         return !empty($identifier) && (class_exists($identifier, false) || $this->renderingContext->getCache()->get($identifier));
156 156
 =======
@@ -369,6 +369,4 @@  discard block
 block discarded – undo
369 369
             $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10);
370 370
         }
371 371
         $closure .= '}';
372
-        return $closure;
373
-    }
374
-}
372
+        return $closure
375 373
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -369,6 +369,4 @@
 block discarded – undo
369 369
             $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10);
370 370
         }
371 371
         $closure .= '}';
372
-        return $closure;
373
-    }
374
-}
372
+        return $closure
375 373
\ No newline at end of file
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -3 removed lines patch added patch discarded remove patch
@@ -369,6 +369,4 @@
 block discarded – undo
369 369
             $closure .= sprintf('$argument = unserialize(\'%s\'); return $argument->evaluate($renderingContext);', serialize($argument)) . chr(10);
370 370
         }
371 371
         $closure .= '}';
372
-        return $closure;
373
-    }
374
-}
372
+        return $closure
375 373
\ No newline at end of file
Please login to merge, or discard this patch.