patternseek / componentview

lib/Template/TwigTemplate.php

Spacing +15 added lines, -15 removed lines

@@ -57,14 +57,14 @@ 
         $templatePath = null,
         $templateString = null,
         ResourceRepository $repo = null
-    ){
-        parent::__construct( $component );
+    ) {
+        parent::__construct($component);
         $this->templatePath = $templatePath;
         $this->templateString = $templateString;
         // Optional Puli repo
         $this->repo = $repo;
 
-        $this->initTwig( $this->getLoader() );
+        $this->initTwig($this->getLoader());
     }
 
     /**
@@ -72,18 +72,18 @@ 
      * @param array $props
      * @return Response
      */
-    protected function doRender( ViewState $state, array $props = [] ): Response
+    protected function doRender(ViewState $state, array $props = [ ]): Response
     {
         // If puli plugin is available then add it.
-        if (class_exists( "Puli\\TwigExtension\\PuliExtension" ) && null !== $this->repo) {
-            $this->twig->addExtension( new PuliExtension( $this->repo ) );
+        if (class_exists("Puli\\TwigExtension\\PuliExtension") && null !== $this->repo) {
+            $this->twig->addExtension(new PuliExtension($this->repo));
         }
-        if( $this->templateString ){
+        if ($this->templateString) {
             $template = $this->twig->createTemplate($this->templateString);
         }
         
         $rendered = $this->twig->render(
-            $template??$this->templatePath,
+            $template ?? $this->templatePath,
             [
                 'state' => $state,
                 'props' => $props,
@@ -91,17 +91,17 @@ 
                 'parent' => $this->component->getParent(),
                 'exec' => $this->component->exec
             ] );
-        return new Response( "text/html", $rendered );
+        return new Response("text/html", $rendered);
     }
 
     /**
      * @return Twig_LoaderInterface
      */
-    protected function getLoader(): ChainLoader|ArrayLoader|LoaderInterface
+    protected function getLoader(): ChainLoader | ArrayLoader | LoaderInterface
     {
 
-        if (class_exists( "Puli\\TwigExtension\\PuliExtension" ) && null !== $this->repo) {
-            $loader = new ChainLoader( [ new PuliTemplateLoader( $this->repo ), new Twig_Loader_String() ] );
+        if (class_exists("Puli\\TwigExtension\\PuliExtension") && null !== $this->repo) {
+            $loader = new ChainLoader([ new PuliTemplateLoader($this->repo), new Twig_Loader_String() ]);
         }else {
             $loader = new ArrayLoader();
         }
@@ -111,13 +111,13 @@ 
     /**
      * @param $loader
      */
-    protected function initTwig( $loader )
+    protected function initTwig($loader)
     {
         $config = [ 'autoescape' => false ];
-        if (defined( "TWIG_CACHE_DIR" )) {
+        if (defined("TWIG_CACHE_DIR")) {
             $config[ 'cache' ] = TWIG_CACHE_DIR;
         }
-        $this->twig = new Environment( $loader, $config );
+        $this->twig = new Environment($loader, $config);
     }
 
 }

Braces +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 
         if (class_exists( "Puli\\TwigExtension\\PuliExtension" ) && null !== $this->repo) {
             $loader = new ChainLoader( [ new PuliTemplateLoader( $this->repo ), new Twig_Loader_String() ] );
-        }else {
+        } else {
             $loader = new ArrayLoader();
         }
         return $loader;

lib/AbstractViewComponent.php

Spacing +98 added lines, -98 removed lines

@@ -74,7 +74,7 @@ 
         AbstractViewComponent $parent = null,
         ExecHelper $execHelper = null,
         LoggerInterface $logger = null
-    ){
+    ) {
         // Null means we are root
         $this->parent = $parent;
 
@@ -84,11 +84,11 @@ 
         if (null === $execHelper) {
             $execHelper = new ExecHelper();
         }
-        $this->setExec( $execHelper );
+        $this->setExec($execHelper);
 
         $this->handleDependencyInjection();
         
-        $this->setLogger( $logger );
+        $this->setLogger($logger);
 
         // Set up the state container
         $this->initState();
@@ -99,14 +99,14 @@ 
      * @param string $level A constant from LogLevel
      * @param array|atring $context
      */
-    protected function log( string $message, string $level, array|string $context = [] ){
-        if( isset( $this->logger ) ){
-            $class = get_class( $this );
+    protected function log(string $message, string $level, array | string $context = [ ]) {
+        if (isset($this->logger)) {
+            $class = get_class($this);
             $message = "[{$class}] {$message}";
-            if( ! is_array($context) ){
-                $context = [$context];
+            if (!is_array($context)) {
+                $context = [ $context ];
             }
-            $this->logger->log( $level, $message, $context );
+            $this->logger->log($level, $message, $context);
         }
     }
 
@@ -118,7 +118,7 @@ 
     {
         $ser = serialize($this);
         // We have to unserialise the serialised object here because it's stripped down to only the required properties by __sleep()
-        $this->log( "Dehydrating", LogLevel::DEBUG, [unserialize($ser)] );
+        $this->log("Dehydrating", LogLevel::DEBUG, [ unserialize($ser) ]);
         return $ser;
     }
 
@@ -126,16 +126,16 @@ 
      * Use this to unserialise ViewComponents
      * Note that we have implemented __sleep() so not all members are serialised.
      */
-    public static function rehydrate( $serialised, ExecHelper $execHelper, LoggerInterface $logger = null ): AbstractViewComponent
+    public static function rehydrate($serialised, ExecHelper $execHelper, LoggerInterface $logger = null): AbstractViewComponent
     {
         /** @var AbstractViewComponent $view */
-        $view = unserialize( $serialised );
-        if( null !== $logger ){
-            $logger->log( LogLevel::DEBUG, "Rehydrating", [$view] );
+        $view = unserialize($serialised);
+        if (null !== $logger) {
+            $logger->log(LogLevel::DEBUG, "Rehydrating", [ $view ]);
         }
-        $view->setExec( $execHelper );
+        $view->setExec($execHelper);
         $view->handleDependencyInjection();
-        $view->setLogger( $logger );
+        $view->setLogger($logger);
         return $view;
     }
 
@@ -156,16 +156,16 @@ 
      * Implement JsonSerializable interface, for logging mainly
      * @return mixed
      */
-    #[Pure] public function jsonSerialize(): mixed
+    #[Pure ] public function jsonSerialize(): mixed
     {
-        $ret = [];
+        $ret = [ ];
         // Return the same fields as __sleep() specifies for serialize()
-        foreach ( $this->__sleep() as $member ){
+        foreach ($this->__sleep() as $member) {
             // Skip parent because recursion isn't supported
-            if( $member == 'parent'){
+            if ($member == 'parent') {
                 continue;
             }
-            $ret[$member] = $this->$member;
+            $ret[ $member ] = $this->$member;
         }
         return $ret;
     }
@@ -177,7 +177,7 @@ 
      * @throws Exception
      * @return Response
      */
-    public function render( $execMethodName = null, array $execArgs = null ): Response
+    public function render($execMethodName = null, array $execArgs = null): Response
     {
         $this->state->validate();
 
@@ -192,13 +192,13 @@ 
         // If we're called with an 'exec' then run it instead of rendering the whole tree.
         // It may still render the whole tree or it may just render a portion or just return JSON
         if ($execMethodName) { // Used to test for null but it could easily be an empty string
-            $this->log( "Rendering with exec: {$execMethodName}, args:".var_export($execArgs, true ), LogLevel::DEBUG );
-            $out = $this->execMethod( $execMethodName, $execArgs );
+            $this->log("Rendering with exec: {$execMethodName}, args:".var_export($execArgs, true), LogLevel::DEBUG);
+            $out = $this->execMethod($execMethodName, $execArgs);
         }else {
-            $this->log( "Rendering without exec", LogLevel::DEBUG );
-            $out = $this->template->render( $this->state, $this->props );
-            if (!( $out instanceof Response )) {
-                throw new Exception( get_class( $this->template ) . " returned invalid response. Should have been an instance of PatternSeek\ComponentView\Response" );
+            $this->log("Rendering without exec", LogLevel::DEBUG);
+            $out = $this->template->render($this->state, $this->props);
+            if (!($out instanceof Response)) {
+                throw new Exception(get_class($this->template)." returned invalid response. Should have been an instance of PatternSeek\ComponentView\Response");
             }
         }
         return $out;
@@ -212,34 +212,34 @@ 
      * @throws Exception
      * @return Response
      */
-    protected function execMethod( $methodName, array $args = null ): Response
+    protected function execMethod($methodName, array $args = null): Response
     {
-        if (!is_array( $methodName )) {
-            $methodName = explode( '.', $methodName );
+        if (!is_array($methodName)) {
+            $methodName = explode('.', $methodName);
         }
-        if (count( $methodName ) == 1) {
-            $methodName = $methodName[ 0 ] . 'Handler';
-            $out = $this->$methodName( $args );
+        if (count($methodName) == 1) {
+            $methodName = $methodName[ 0 ].'Handler';
+            $out = $this->$methodName($args);
         }else {
-            $childName = array_shift( $methodName );
+            $childName = array_shift($methodName);
             $child = $this->childComponents[ $childName ];
             if ($child instanceof AbstractViewComponent) {
-                $out = $child->execMethod( $methodName, $args );
+                $out = $child->execMethod($methodName, $args);
             }else {
-                throw new Exception( implode( ".", $methodName ) . " is not a valid method." );
+                throw new Exception(implode(".", $methodName)." is not a valid method.");
             }
         }
-        if (!( $out instanceof Response )) {
-            $nameStr = is_array( $methodName )?implode( ".", $methodName ):$methodName;
-            throw new Exception( $nameStr . " returned invalid response. Should have been an instance of PatternSeek\ComponentView\Response" );
+        if (!($out instanceof Response)) {
+            $nameStr = is_array($methodName) ?implode(".", $methodName) : $methodName;
+            throw new Exception($nameStr." returned invalid response. Should have been an instance of PatternSeek\ComponentView\Response");
         }
         return $out;
     }
 
-    public function getExecPath( $execMethod ): string
+    public function getExecPath($execMethod): string
     {
         $path = $this->getPath();
-        return ( $path === null?$execMethod:$path . '.' . $execMethod );
+        return ($path === null ? $execMethod : $path.'.'.$execMethod);
     }
 
     public function getParent(): ?AbstractViewComponent
@@ -248,12 +248,12 @@ 
     }
 
 
-    protected function setFlashMessage( $string )
+    protected function setFlashMessage($string)
     {
         $this->flashMessage = $string;
     }
 
-    protected function setFlashError( string $string )
+    protected function setFlashError(string $string)
     {
         $this->flashError = $string;
     }
@@ -297,7 +297,7 @@ 
         }
         $pPath = $this->parent->getPath();
         if (null !== $pPath) {
-            return $pPath . '.' . $this->handle;
+            return $pPath.'.'.$this->handle;
         }else {
             return $this->handle;
         }
@@ -311,20 +311,20 @@ 
      * @param array $props
      * @throws Exception
      */
-    protected function addOrUpdateChild( $handle, $type, array $props = [ ] )
+    protected function addOrUpdateChild($handle, $type, array $props = [ ])
     {
-        $this->log( "Adding/updating child '{$handle}' of type {$type}", LogLevel::DEBUG );
-        if (!isset( $this->childComponents[ $handle ] )) {
-            if( ! class_exists( $type ) ){
-                throw new Exception( "Class '{$type}' for sub-component  does not exist." );
+        $this->log("Adding/updating child '{$handle}' of type {$type}", LogLevel::DEBUG);
+        if (!isset($this->childComponents[ $handle ])) {
+            if (!class_exists($type)) {
+                throw new Exception("Class '{$type}' for sub-component  does not exist.");
             }
-            $child = new $type( $handle, $this, $this->exec, $this->logger );
+            $child = new $type($handle, $this, $this->exec, $this->logger);
             $this->childComponents[ $handle ] = $child;
         }else {
             // exec, di and logger are set recursively in rehydrate()
             $child = $this->childComponents[ $handle ];
         }
-        $child->updateProps( $props );
+        $child->updateProps($props);
         $child->updateState();
     }
 
@@ -335,12 +335,12 @@ 
      * @return string
      * @throws Exception
      */
-    public function renderChild( $handle ): string
+    public function renderChild($handle): string
     {
         if (!$this->childComponents[ $handle ]) {
             $message = "Attempted to render nonexistent child component with handle '{$handle}'";
-            $this->log( $message, LogLevel::CRITICAL );
-            throw new Exception( $message );
+            $this->log($message, LogLevel::CRITICAL);
+            throw new Exception($message);
         }
         return $this->childComponents[ $handle ]->render()->content;
     }
@@ -388,58 +388,58 @@ 
      * @param array $inputs
      * @throws Exception
      */
-    protected function testInputs( array $inputSpec, array &$inputs )
+    protected function testInputs(array $inputSpec, array &$inputs)
     {
         
         foreach ($inputSpec as $fieldName => $fieldSpec) {
             // Required field
-            if (( count( $fieldSpec ) < 2 )) {
-                if (!isset( $inputs[ $fieldName ] )) {
-                    $calledFunc = debug_backtrace()[1]['function'];
-                    $callerFunc = debug_backtrace()[2]['function'];
-                    $callerClass = debug_backtrace()[2]['class'];
+            if ((count($fieldSpec) < 2)) {
+                if (!isset($inputs[ $fieldName ])) {
+                    $calledFunc = debug_backtrace()[ 1 ][ 'function' ];
+                    $callerFunc = debug_backtrace()[ 2 ][ 'function' ];
+                    $callerClass = debug_backtrace()[ 2 ][ 'class' ];
                     $parentText = '';
-                    if( $this->parent !== null ){
+                    if ($this->parent !== null) {
                         $parentText = " (parent component is ".get_class($this->parent).")";
                     }
-                    throw new Exception( $fieldName . " is a required field for " . get_class( $this )."::{$calledFunc}() called from {$callerClass}::{$callerFunc}(){$parentText}" );
+                    throw new Exception($fieldName." is a required field for ".get_class($this)."::{$calledFunc}() called from {$callerClass}::{$callerFunc}(){$parentText}");
                 }
             }
             // Set default is unset
-            if (!isset( $inputs[ $fieldName ] )) {
+            if (!isset($inputs[ $fieldName ])) {
                 $inputs[ $fieldName ] = $fieldSpec[ 1 ];
             }
             // Check type
             // Any type allowed, continue
-            if (!isset( $fieldSpec[ 0 ] ) || $fieldSpec[ 0 ] === null) {
+            if (!isset($fieldSpec[ 0 ]) || $fieldSpec[ 0 ] === null) {
                 continue;
             }
             $requiredType = $fieldSpec[ 0 ];
             $input = $inputs[ $fieldName ];
             // Specific type required
             // Null is allowed
-            if (!is_null( $input )) {
-                $failed = match ( $requiredType ) {
-                    "string" => !is_string( $input ),
-                    "array" => !is_array( $input ),
-                    "object" => !is_object( $input ),
-                    "resource" => !is_resource( $input ),
-                    "callable" => !is_callable( $input ),
-                    "boolean", "bool" => !is_bool( $input ),
-                    "integer", "int" => !is_int( $input ),
-                    "double" => !is_double( $input ),
-                    "float" => !is_float( $input ),
-                    default => !( $input instanceof $requiredType ),
+            if (!is_null($input)) {
+                $failed = match ($requiredType) {
+                    "string" => !is_string($input),
+                    "array" => !is_array($input),
+                    "object" => !is_object($input),
+                    "resource" => !is_resource($input),
+                    "callable" => !is_callable($input),
+                    "boolean", "bool" => !is_bool($input),
+                    "integer", "int" => !is_int($input),
+                    "double" => !is_double($input),
+                    "float" => !is_float($input),
+                    default => !($input instanceof $requiredType),
                 };
                 if ($failed) {
-                    $calledFunc = debug_backtrace()[1]['function'];
-                    $callerFunc = debug_backtrace()[2]['function'];
-                    $callerClass = debug_backtrace()[2]['class'];
+                    $calledFunc = debug_backtrace()[ 1 ][ 'function' ];
+                    $callerFunc = debug_backtrace()[ 2 ][ 'function' ];
+                    $callerClass = debug_backtrace()[ 2 ][ 'class' ];
                     $parentText = '';
-                    if( $this->parent !== null ){
+                    if ($this->parent !== null) {
                         $parentText = " (parent component is ".get_class($this->parent).")";
                     }
-                    throw new Exception( $fieldName . " should be of type " . $requiredType . "in " . get_class( $this )."::{$calledFunc}() called from {$callerClass}::{$callerFunc}(){$parentText}" );
+                    throw new Exception($fieldName." should be of type ".$requiredType."in ".get_class($this)."::{$calledFunc}() called from {$callerClass}::{$callerFunc}(){$parentText}");
                 }
             }
         }
@@ -448,9 +448,9 @@ 
     /**
      * Update the full component view tree.
      */
-    public function updateView( array $props )
+    public function updateView(array $props)
     {
-        $this->updateProps( $props );
+        $this->updateProps($props);
         $this->updateState();
     }
 
@@ -459,13 +459,13 @@ 
      *
      * @var array $props
      */
-    protected function updateProps( array $props )
+    protected function updateProps(array $props)
     {
-        $this->log( "Storing new props: ", LogLevel::DEBUG,  var_export( $props, true ) );
+        $this->log("Storing new props: ", LogLevel::DEBUG, var_export($props, true));
         $this->props = $props;   
     }
 
-    protected function forceResponse( Response $response )
+    protected function forceResponse(Response $response)
     {
         $this->forceResponse = $response;
     }
@@ -473,12 +473,12 @@ 
     /**
      * @param ExecHelper $execHelper
      */
-    private function setExec( ExecHelper $execHelper )
+    private function setExec(ExecHelper $execHelper)
     {
         $this->exec = clone $execHelper;
-        $this->exec->setComponent( $this );
-        foreach( $this->childComponents as $child ){
-            $child->setExec( $execHelper );
+        $this->exec->setComponent($this);
+        foreach ($this->childComponents as $child) {
+            $child->setExec($execHelper);
         }
     }
 
@@ -492,9 +492,9 @@ 
         // it manually and you still get the advantage that the deps
         // are specified in the optional injectDependencies() method's
         // signature
-        $this->log( "Dependency injection...", LogLevel::DEBUG );
-        DependencyInjector::instance()->injectIntoMethod( $this );
-        foreach( $this->childComponents as $child ){
+        $this->log("Dependency injection...", LogLevel::DEBUG);
+        DependencyInjector::instance()->injectIntoMethod($this);
+        foreach ($this->childComponents as $child) {
             $child->handleDependencyInjection();
         }
     }
@@ -502,13 +502,13 @@ 
     /**
      * @param LoggerInterface $logger
      */
-    private function setLogger( LoggerInterface $logger = null )
+    private function setLogger(LoggerInterface $logger = null)
     {
-        if( null !== $logger ){
+        if (null !== $logger) {
             $this->logger = $logger;
             /** @var AbstractViewComponent $child */
-            foreach( $this->childComponents as $child ){
-                $child->setLogger( $logger );
+            foreach ($this->childComponents as $child) {
+                $child->setLogger($logger);
             }
         }
     }

Braces +5 added lines, -5 removed lines

@@ -194,7 +194,7 @@ 
         if ($execMethodName) { // Used to test for null but it could easily be an empty string
             $this->log( "Rendering with exec: {$execMethodName}, args:".var_export($execArgs, true ), LogLevel::DEBUG );
             $out = $this->execMethod( $execMethodName, $execArgs );
-        }else {
+        } else {
             $this->log( "Rendering without exec", LogLevel::DEBUG );
             $out = $this->template->render( $this->state, $this->props );
             if (!( $out instanceof Response )) {
@@ -220,12 +220,12 @@ 
         if (count( $methodName ) == 1) {
             $methodName = $methodName[ 0 ] . 'Handler';
             $out = $this->$methodName( $args );
-        }else {
+        } else {
             $childName = array_shift( $methodName );
             $child = $this->childComponents[ $childName ];
             if ($child instanceof AbstractViewComponent) {
                 $out = $child->execMethod( $methodName, $args );
-            }else {
+            } else {
                 throw new Exception( implode( ".", $methodName ) . " is not a valid method." );
             }
         }
@@ -298,7 +298,7 @@ 
         $pPath = $this->parent->getPath();
         if (null !== $pPath) {
             return $pPath . '.' . $this->handle;
-        }else {
+        } else {
             return $this->handle;
         }
     }
@@ -320,7 +320,7 @@ 
             }
             $child = new $type( $handle, $this, $this->exec, $this->logger );
             $this->childComponents[ $handle ] = $child;
-        }else {
+        } else {
             // exec, di and logger are set recursively in rehydrate()
             $child = $this->childComponents[ $handle ];
         }