Merge pull request ezsystems#44 from ezsystems/feature-august-5-after…

…noon Feature august 5 afternoon
ezecosystem · Aug 5, 2018 · f62c16d · f62c16d
2 parents ad950b1 + 857d991
commit f62c16d
Show file tree

Hide file tree

Showing 24 changed files with 162 additions and 226 deletions.
diff --git a/.cs/.php_cs.php b/.cs/.php_cs.php
@@ -21,6 +21,7 @@
                                 'phpdoc_no_package'           => false,
                                 'phpdoc_inline_tag'           => false,
                                 'cast_spaces'                 => false,
+                                'no_superfluous_phpdoc_tags'  => true,
                             ]
                         )
                         ->setFinder($finder);
diff --git a/composer.lock b/composer.lock
diff --git a/payload/dev/docker-compose.yml b/payload/dev/docker-compose.yml
@@ -110,3 +110,9 @@ services:
             - BLACKFIRE_CLIENT_TOKEN
             - BLACKFIRE_SERVER_ID
             - BLACKFIRE_SERVER_TOKEN
+
+    # Mysql-Proxy
+    mysqlproxy:
+        image: plopix/docker-mysqlproxyprofiler
+        environment:
+        - 'BACKEND=db:3306'
diff --git a/payload/dev/engine/php.ini b/payload/dev/engine/php.ini
@@ -11,11 +11,25 @@ memory_limit = 2048M
 post_max_size = 40M
 upload_max_filesize = 40M
 
-##REDIS_CONFIG##
-##SENDMAIL_CONFIG##
+session.save_handler = redis
+session.save_path = "tcp://redis:6379"
+
+sendmail_path = /usr/bin/env catchmail --smtp-ip mailcatcher --smtp-port 1025 -f docker@localhost
 
 extension=blackfire.so
 blackfire.agent_socket=tcp://blackfire:8707
 
+# X-Debug is disable by default, uncomment and run 'ez stop engine; ez build engine; ez up engine' to enable it
+#zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20170718/xdebug.so
+#xdebug.remote_enable=1
+## Using Linux? define the correct host and if you find a automated way to do it: tell us on the channel #ez-launchpad
+#xdebug.remote_host=host.docker.internal
+#xdebug.remote_port=9000
+#xdebug.max_nesting_level=1000
+#xdebug.remote_autostart=1
+#xdebug.remote_connect_back=0
+
 [Date]
 date.timezone = "America/Los_Angeles"
+
+
diff --git a/payload/dev/nginx/nginx.conf b/payload/dev/nginx/nginx.conf
@@ -15,6 +15,9 @@ server {
     # Would be great to get that from ENV var PROJECTMAPPINGFOLDER
     root "/var/www/html/project/ezplatform/web";
 
+    # FOR DFS
+    # include ez_params.d/ez_rewrite_dfsimage_params;
+
     # ez rewrite rules
     include ez_params.d/ez_rewrite_params;
 
@@ -45,6 +48,9 @@ server {
 
     include ez_params.d/ez_prod_rewrite_params;
 
+    # FOR DFS
+    # include ez_params.d/ez_rewrite_dfsimage_params;
+
     # ez rewrite rules
     include ez_params.d/ez_rewrite_params;
 
@@ -77,6 +83,9 @@ server {
 
     include ez_params.d/ez_prod_rewrite_params;
 
+    # FOR DFS
+    # include ez_params.d/ez_rewrite_dfsimage_params;
+
     # ez rewrite rules
     include ez_params.d/ez_rewrite_params;
 

diff --git a/payload/platformsh/.platform.app.yaml b/payload/platformsh/.platform.app.yaml
@@ -68,15 +68,15 @@ hooks:
         bin/console cache:pool:clear cache.redis
         bin/console cache:clear
 
-# The configuration of scheduled execution.
-# see http://symfony.com/doc/current/components/console/introduction.html
-#crons:
-#    symfony:
-#        spec: "*/20 * * * *"
-#        cmd: "php cron.php example:test"
-#    ezplatform:
-#        spec: "* * * * *"
-#        cmd: "cd ezplatform; php php bin/console ezplatform:cron:run --env=prod"
+crons:
+    minute:
+        # NOTE: Platform.sh PS does not execute every minute, so might sometimes miss jobs scheduled for a given time
+        spec: "* * * * *"
+        cmd: "php bin/console ezplatform:cron:run"
+    weekly:
+        spec: "0 0 * * 0"
+        cmd: "php bin/console ezplatform:check-urls"
+
 
 runtime:
     extensions:

diff --git a/src/Command/Docker/Create.php b/src/Command/Docker/Create.php
@@ -23,8 +23,6 @@ class Create extends DockerCommand
 
     /**
      * Status constructor.
-     *
-     * @param ProjectStatusDumper $projectStatusDumper
      */
     public function __construct(ProjectStatusDumper $projectStatusDumper)
     {

diff --git a/src/Command/Docker/Initialize.php b/src/Command/Docker/Initialize.php
@@ -31,8 +31,6 @@ class Initialize extends Command
 
     /**
      * Status constructor.
-     *
-     * @param ProjectStatusDumper $projectStatusDumper
      */
     public function __construct(ProjectStatusDumper $projectStatusDumper)
     {
@@ -103,30 +101,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             0755
         );
 
-        // PHP.ini ADAPTATION
-        $phpINIPath = "{$provisioningFolder}/dev/engine/php.ini";
-        $conf       = <<<END
-; redis configuration in dev 
-session.save_handler = redis
-session.save_path = "tcp://redis:6379"
-END;
-        $iniContent = file_get_contents($phpINIPath);
-        $iniContent = str_replace(
-            '##REDIS_CONFIG##',
-            $compose->hasService('redis') ? $conf : '',
-            $iniContent
-        );
-
-        $conf       = <<<END
-; mailcatcher configuration in dev 
-sendmail_path = /usr/bin/env catchmail --smtp-ip mailcatcher --smtp-port 1025 -f docker@localhost
-END;
-        $iniContent = str_replace(
-            '##SENDMAIL_CONFIG##',
-            $compose->hasService('mailcatcher') ? $conf : '',
-            $iniContent
-        );
-        $fs->dumpFile($phpINIPath, $iniContent);
         unset($selectedServices);
 
         // Clean the Compose File
@@ -187,10 +161,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * @param Docker         $dockerClient
-     * @param DockerCompose  $compose
-     * @param string         $composeFilePath
-     * @param InputInterface $input
+     * @param string $composeFilePath
      */
     protected function innerInitialize(
         Docker $dockerClient,
@@ -218,7 +189,7 @@ protected function innerInitialize(
         $initialdata = $input->getArgument('initialdata');
 
         if ('clean' === $initialdata && false !== strpos($repository, 'ezplatform-ee')) {
-            $initialdata = 'studio-clean';
+            $initialdata = 'ezplatform-ee-clean';
         }
 
         $executor->eZInstall($input->getArgument('version'), $repository, $initialdata);

diff --git a/src/Command/Docker/Status.php b/src/Command/Docker/Status.php
@@ -24,8 +24,6 @@ class Status extends DockerCommand
 
     /**
      * Status constructor.
-     *
-     * @param ProjectStatusDumper $projectStatusDumper
      */
     public function __construct(ProjectStatusDumper $projectStatusDumper)
     {

diff --git a/src/Configuration/Project.php b/src/Configuration/Project.php
@@ -78,7 +78,6 @@ public function get($name)
 
     /**
      * @param string $name
-     * @param mixed  $value
      */
     public function setLocal($name, $value)
     {
@@ -87,7 +86,6 @@ public function setLocal($name, $value)
 
     /**
      * @param string $name
-     * @param mixed  $value
      */
     public function setGlobal($name, $value)
     {

diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -133,8 +133,6 @@ public function doRun(InputInterface $input, OutputInterface $output)
 
     /**
      * Load the configuration file.
-     *
-     * @param InputInterface $input
      */
     protected function loadConfiguration(InputInterface $input)
     {

diff --git a/src/Core/Client/Docker.php b/src/Core/Client/Docker.php
@@ -36,9 +36,7 @@ class Docker
     /**
      * Docker constructor.
      *
-     * @param array                   $options
-     * @param ProcessRunner           $runner
-     * @param OptimizerInterface|null $optimizer
+     * @param array $options
      */
     public function __construct($options, ProcessRunner $runner, OptimizerInterface $optimizer = null)
     {
@@ -126,17 +124,11 @@ protected function getProvisioningFolderName()
         return $this->options['provisioning-folder-name'];
     }
 
-    /**
-     * @return mixed
-     */
     protected function getHostExportedPath()
     {
         return explode(':', $this->options['host-machine-mapping'])[0];
     }
 
-    /**
-     * @return mixed
-     */
     protected function getMachineMountPath()
     {
         return explode(':', $this->options['host-machine-mapping'])[1];
@@ -153,7 +145,6 @@ public function start($service = '')
     }
 
     /**
-     * @param array  $args
      * @param string $service
      *
      * @return Process
@@ -164,7 +155,6 @@ public function build(array $args = [], $service = '')
     }
 
     /**
-     * @param array  $args
      * @param string $service
      *
      * @return Process
@@ -175,7 +165,6 @@ public function up(array $args = [], $service = '')
     }
 
     /**
-     * @param array  $args
      * @param string $service
      *
      * @return Process
@@ -196,8 +185,6 @@ public function stop($service = '')
     }
 
     /**
-     * @param array $args
-     *
      * @return Process
      */
     public function down(array $args = [])
@@ -206,8 +193,6 @@ public function down(array $args = [])
     }
 
     /**
-     * @param array $args
-     *
      * @return Process
      */
     public function ps(array $args = [])
@@ -216,7 +201,6 @@ public function ps(array $args = [])
     }
 
     /**
-     * @param array  $args
      * @param string $service
      *
      * @return Process
@@ -227,7 +211,6 @@ public function logs(array $args = [], $service = '')
     }
 
     /**
-     * @param array  $args
      * @param string $service
      *
      * @return Process
@@ -239,7 +222,6 @@ public function pull(array $args = [], $service = '')
 
     /**
      * @param string $command
-     * @param array  $args
      * @param string $service
      *
      * @return Process
@@ -296,7 +278,6 @@ public function getComposeEnvVariables()
     /**
      * @param string $action
      * @param string $service
-     * @param array  $args
      * @param false  $dryRun
      *
      * @return Process|string

diff --git a/src/Core/Command.php b/src/Core/Command.php
@@ -57,9 +57,6 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         $this->io = new SymfonyStyle($input, $output);
     }
 
-    /**
-     * @param ProjectConfiguration $configuration
-     */
     public function setProjectConfiguration(ProjectConfiguration $configuration)
     {
         $this->projectConfiguration = $configuration;

diff --git a/src/Core/DockerCompose.php b/src/Core/DockerCompose.php
@@ -26,9 +26,6 @@ public function __construct($filePath)
         $this->compose = Yaml::parse(file_get_contents($filePath));
     }
 
-    /**
-     * @return mixed
-     */
     public function getServices()
     {
         return $this->compose['services'];

diff --git a/src/Core/OSX/Optimizer/NFSAwareInterface.php b/src/Core/OSX/Optimizer/NFSAwareInterface.php
@@ -24,8 +24,6 @@ interface NFSAwareInterface
     const RESV = '/etc/nfs.conf';
 
     /**
-     * @param SymfonyStyle $io
-     *
      * @return bool
      */
     public function restartNFSD(SymfonyStyle $io);
@@ -45,15 +43,10 @@ public function isExportReady($export);
      */
     public function isResvReady();
 
-    /**
-     * @param SymfonyStyle $io
-     * @param string       $exportLine
-     */
     public function setupNFS(SymfonyStyle $io, $exportOptions);
 
     /**
-     * @param SymfonyStyle $io
-     * @param string       $exportLine
+     * @param string $exportLine
      */
     public function standardNFSConfigurationMessage(SymfonyStyle $io, $exportLine);
 

diff --git a/src/Core/OSX/Optimizer/OptimizerInterface.php b/src/Core/OSX/Optimizer/OptimizerInterface.php
@@ -20,18 +20,10 @@ interface OptimizerInterface
     public function isEnabled();
 
     /**
-     * @param SymfonyStyle $io
-     *
      * @return bool
      */
     public function hasPermission(SymfonyStyle $io);
 
-    /**
-     * @param SymfonyStyle $io
-     * @param Command      $command
-     *
-     * @return mixed
-     */
     public function optimize(SymfonyStyle $io, Command $command);
 
     /**

diff --git a/src/Core/ProjectStatusDumper.php b/src/Core/ProjectStatusDumper.php
@@ -33,8 +33,6 @@ class ProjectStatusDumper
 
     /**
      * ProjectStatusDumper constructor.
-     *
-     * @param ProjectConfiguration $projectConfiguration
      */
     public function __construct(ProjectConfiguration $projectConfiguration)
     {