WIP: Sf4 Compat

docker-compose.yml

@@ -39,10 +39,10 @@ services:
             dockerfile: Dockerfile
         container_name: widgets-php
         volumes:
-            - './:/app'
+            - './:/project'
             - ~/.composer:/home/docker/.composer            
         hostname: widgets.splashsync.local
-        command:            ["php", "/app/bin/console", "server:run", "172.169.1.10:80"]
+        command:            ["php", "/project/bin/console", "server:run", "-d/project/web", "172.169.1.10:80"]
         networks:
             widgets:        { ipv4_address: 172.169.1.10 }
 

docker/Dockerfile

@@ -17,7 +17,7 @@
 
 FROM php:7.4-alpine
 EXPOSE 80
-WORKDIR /app
+WORKDIR /project
 
 ################################################################################
 # Install Required Libs
@@ -32,21 +32,5 @@ RUN docker-php-ext-install zip
 ENV COMPOSER_MEMORY_LIMIT: -1
 ENV COMPOSER_HOME: '/home/docker/.composer'
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer 
-#################################################################################
-## Clone Project
-#RUN git clone https://github.com/SplashSync/Toolkit.git --depth=1 /app
-#################################################################################
-## Configure Project
-#COPY .env /app/.env
-#COPY config/splash.yml /app/config/packages/splash.yml
-#################################################################################
-## Run Composer
-#RUN cd /app && php -d memory_limit=-1 /usr/bin/composer update
-##RUN cd /app && php -d memory_limit=-1 /usr/bin/composer install
-#################################################################################
-## Install Project
-#RUN php /app/bin/console assets:install --no-debug
-#RUN php /app/bin/console doctrine:schema:update --force
-#RUN php /app/bin/console cache:clear
 
-CMD ["php", "/app/bin/console", "server:run", "80"]
+CMD ["php", "/project/bin/console", "server:run", "80"]

docker/install.sh

@@ -26,8 +26,8 @@ echo "** Configure Symfony ..."
 echo "*************************************************************************"
 
 docker-compose exec symfony composer install
-docker-compose exec symfony php /app/bin/console doctrine:schema:update --force
-docker-compose exec symfony php /app/bin/console cache:clear
+docker-compose exec symfony php bin/console doctrine:schema:update --force
+docker-compose exec symfony php bin/console cache:clear
 
 echo "*************************************************************************"
 echo "** Install Webpack "

docker/restart.sh

@@ -26,5 +26,5 @@ echo "*************************************************************************"
 echo "** Configure the Demo ..."
 echo "*************************************************************************"
 
-docker-compose exec symfony php /app/bin/console doctrine:schema:update --force
-docker-compose exec symfony php /app/bin/console cache:clear
+docker-compose exec symfony php bin/console doctrine:schema:update --force
+docker-compose exec symfony php bin/console cache:clear

src/Resources/config/demo.yml

@@ -1,9 +1,10 @@
 services:
 
-    # Demo Widgets Factroy Service
+    # Demo Widgets Factory Service
     splash.widgets.demo.factory:
-        class: Splash\Widgets\Services\Demo\SamplesFactoryService
-        arguments: ["@splash.widgets.factory"]             
+        class:      Splash\Widgets\Services\Demo\SamplesFactoryService
+        arguments:  ["@splash.widgets.factory"]
+        public:     true
         tags:
-            - { name: kernel.event_listener, event: splash.widgets.list.demo, method: onListingAction }
+            - { name: kernel.event_listener, event: Splash\Widgets\Event\ListingEvent, method: onListingAction }
 

src/Resources/config/test.yml

@@ -2,8 +2,8 @@ services:
 
     # Test Widgets Factory Service
     splash.widgets.test.factory:
-        class: Splash\Widgets\Tests\Services\SamplesFactoryService
-        arguments: ["@splash.widgets.factory"]             
+        class:      Splash\Widgets\Tests\Services\SamplesFactoryService
+        arguments:  ["@splash.widgets.factory"]
         public:     true
         tags:
             - { name: kernel.event_listener, event: Splash\Widgets\Event\ListingEvent,   method: onListingAction }

src/Services/Demo/SamplesFactoryService.php

@@ -29,6 +29,9 @@ class SamplesFactoryService implements WidgetProviderInterface
     const PREFIX = "Splash\\Widgets\\Models\\Demo\\Blocks\\";
     const SERVICE = "splash.widgets.demo.factory";
     const ORIGIN = "<i class='fa fa-flask text-success' aria-hidden='true'>&nbsp;</i>Demo Factory";
+    const MODES = array(
+        "splash.widgets.list.demo",
+    );
 
     /**
      * WidgetFactory Service
@@ -60,6 +63,11 @@ public function __construct(FactoryService $widgetFactory)
      */
     public function onListingAction(GenericEvent $event) : void
     {
+        $mode = $event->getSubject();
+        if (!is_string($mode) || !in_array($mode, self::MODES, true)) {
+            return;
+        }
+
         $event["Text"] = $this->buildWidgetDefinition("Text")->getWidget();
         $event["Table"] = $this->buildWidgetDefinition("Table")->getWidget();
         $event["Notifications"] = $this->buildWidgetDefinition("Notifications")->getWidget();

src/Services/ManagerService.php

@@ -160,7 +160,7 @@ public function connect(string $service) : bool
     public function read(string $type, array $parameters = array()) : bool
     {
         //==============================================================================
-        // Check Servive is Defined
+        // Check Service is Defined
         if (!($this->service instanceof WidgetProviderInterface)) {
             return false;
         }
@@ -175,7 +175,7 @@ public function read(string $type, array $parameters = array()) : bool
         }
         $this->widget = $widget;
         //==============================================================================
-        // Store Paremeter in Widget From Rendering
+        // Store Parameter in Widget From Rendering
         if ($blockParameters) {
             $this->widget->setParameters($parameters);
         }

tests/Controller/A001InitialisationControllerTest.php

@@ -69,7 +69,9 @@ public function testCacheClear(string $environement) : void
         //====================================================================//
         // Clean Working Dir
         $workingDirectory = (string) $process->getWorkingDirectory();
-        if (strrpos($workingDirectory, "/app") == (strlen($workingDirectory) - 4)) {
+        if (strrpos($workingDirectory, "/web") == (strlen($workingDirectory) - 4)) {
+            $process->setWorkingDirectory(substr($workingDirectory, 0, strlen($workingDirectory) - 4));
+        } elseif (strrpos($workingDirectory, "/app") == (strlen($workingDirectory) - 4)) {
             $process->setWorkingDirectory(substr($workingDirectory, 0, strlen($workingDirectory) - 4));
         }
 

tests/Services/SamplesFactoryService.php

@@ -26,6 +26,11 @@ class SamplesFactoryService extends Base
     const PREFIX = "Splash\\Widgets\\Tests\\Blocks\\";
     const SERVICE = "splash.widgets.test.factory";
     const ORIGIN = "<i class='fa fa-github text-success' aria-hidden='true'>&nbsp;</i>Tests Factory";
+    const MODES = array(
+        "splash.widgets.list.test",
+        "splash.widgets.list.tested",
+        "splash.widgets.list.demo",
+    );
 
     /**
      * Widgets Listing
@@ -35,7 +40,7 @@ class SamplesFactoryService extends Base
     public function onListingAction(GenericEvent $event) : void
     {
         $mode = $event->getSubject();
-        if (!is_string($mode) || !in_array($mode, array("test", "tested", "demo"), true)) {
+        if (!is_string($mode) || !in_array($mode, self::MODES, true)) {
             return;
         }
         $event["Test"] = $this->buildWidgetDefinition("Test")->getWidget();