From 83e71dd3ae0e91a861d7c06d6a608159a5fc021f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Sun, 5 Aug 2018 11:40:08 -0700 Subject: [PATCH 1/7] some missing configuration --- payload/dev/nginx/nginx.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/payload/dev/nginx/nginx.conf b/payload/dev/nginx/nginx.conf index a413bcc..a0775e0 100644 --- 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; From ac63d4c49bfc369bbfcd1d0d1421abf912ee9131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Sun, 5 Aug 2018 11:53:56 -0700 Subject: [PATCH 2/7] Add MySQL Proxy --- payload/dev/docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/payload/dev/docker-compose.yml b/payload/dev/docker-compose.yml index da7a8eb..33ed322 100644 --- 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' From 6a320b5d68194abd43d0d07eb1cc5f585663c449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Sun, 5 Aug 2018 12:31:31 -0700 Subject: [PATCH 3/7] Remove useless config and for some services that are always useful --- payload/dev/engine/php.ini | 6 ++++-- src/Command/Docker/Initialize.php | 26 +------------------------- src/Core/ProjectWizard.php | 2 +- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/payload/dev/engine/php.ini b/payload/dev/engine/php.ini index 99fd06f..13baaa9 100644 --- a/payload/dev/engine/php.ini +++ b/payload/dev/engine/php.ini @@ -11,8 +11,10 @@ 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 diff --git a/src/Command/Docker/Initialize.php b/src/Command/Docker/Initialize.php index dd38d69..16fd255 100644 --- a/src/Command/Docker/Initialize.php +++ b/src/Command/Docker/Initialize.php @@ -103,30 +103,6 @@ protected function execute(InputInterface $input, OutputInterface $output) 0755 ); - // PHP.ini ADAPTATION - $phpINIPath = "{$provisioningFolder}/dev/engine/php.ini"; - $conf = <<hasService('redis') ? $conf : '', - $iniContent - ); - - $conf = <<hasService('mailcatcher') ? $conf : '', - $iniContent - ); - $fs->dumpFile($phpINIPath, $iniContent); unset($selectedServices); // Clean the Compose File @@ -218,7 +194,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/Core/ProjectWizard.php b/src/Core/ProjectWizard.php index 9a8302e..ee27713 100644 --- a/src/Core/ProjectWizard.php +++ b/src/Core/ProjectWizard.php @@ -67,7 +67,7 @@ public function __invoke(DockerCompose $compose) $this->getComposerHttpBasicCredentials(), $this->getSelectedServices( $compose->getServices(), - ['varnish', 'solr', 'mailcatcher', 'adminer', 'redis', 'redisadmin'] + ['varnish', 'solr', 'adminer', 'redisadmin'] ), $this->getProvisioningFolderName(), $this->getComposeFileName(), From 05c4c2907b913b34f185f6768bb3a824b744ffdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Sun, 5 Aug 2018 12:33:40 -0700 Subject: [PATCH 4/7] no_superfluous_phpdoc_tags flag --- .cs/.php_cs.php | 1 + src/Command/Docker/Create.php | 2 -- src/Command/Docker/Initialize.php | 7 +------ src/Command/Docker/Status.php | 2 -- src/Configuration/Project.php | 2 -- src/Console/Application.php | 2 -- src/Core/Client/Docker.php | 21 +------------------ src/Core/Command.php | 3 --- src/Core/DockerCompose.php | 3 --- src/Core/OSX/Optimizer/NFSAwareInterface.php | 9 +------- src/Core/OSX/Optimizer/OptimizerInterface.php | 8 ------- src/Core/ProjectStatusDumper.php | 2 -- src/Core/ProjectWizard.php | 5 ----- src/Core/TaskExecutor.php | 3 --- src/Listener/ApplicationUpdate.php | 3 --- src/Listener/CommandException.php | 3 --- src/Listener/CommandStart.php | 3 --- src/Listener/CommandTerminate.php | 3 --- src/Listener/OSXListener.php | 3 --- 19 files changed, 4 insertions(+), 81 deletions(-) diff --git a/.cs/.php_cs.php b/.cs/.php_cs.php index 2796872..5efdd99 100644 --- 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/src/Command/Docker/Create.php b/src/Command/Docker/Create.php index 5b187b5..53ff014 100644 --- 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 index 16fd255..817a145 100644 --- 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) { @@ -163,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, diff --git a/src/Command/Docker/Status.php b/src/Command/Docker/Status.php index 9f30462..7ce0ad5 100644 --- 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 index 1a11b2a..f56b770 100644 --- 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 index 5f38d33..b594e14 100644 --- 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 index 206620b..04221a6 100644 --- 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 index 2ea27de..090aa32 100644 --- 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 index 8b9edff..c1f18d3 100644 --- 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 index 9697173..a4f3650 100644 --- 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 index c260dd2..9ece6c4 100644 --- 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 index e5562ff..cf318f2 100644 --- 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) { diff --git a/src/Core/ProjectWizard.php b/src/Core/ProjectWizard.php index ee27713..cff8721 100644 --- a/src/Core/ProjectWizard.php +++ b/src/Core/ProjectWizard.php @@ -42,9 +42,6 @@ class ProjectWizard /** * ProjectWizard constructor. - * - * @param SymfonyStyle $io - * @param ProjectConfiguration $configuration */ public function __construct(SymfonyStyle $io, ProjectConfiguration $configuration) { @@ -53,8 +50,6 @@ public function __construct(SymfonyStyle $io, ProjectConfiguration $configuratio } /** - * @param DockerCompose $compose - * * @return array */ public function __invoke(DockerCompose $compose) diff --git a/src/Core/TaskExecutor.php b/src/Core/TaskExecutor.php index 58d7903..f018751 100644 --- a/src/Core/TaskExecutor.php +++ b/src/Core/TaskExecutor.php @@ -33,9 +33,6 @@ class TaskExecutor /** * Executor constructor. - * - * @param DockerClient $dockerClient - * @param ProjectConfiguration $configuration */ public function __construct(DockerClient $dockerClient, ProjectConfiguration $configuration, Collection $recipes) { diff --git a/src/Listener/ApplicationUpdate.php b/src/Listener/ApplicationUpdate.php index f0c30a1..b20033f 100644 --- a/src/Listener/ApplicationUpdate.php +++ b/src/Listener/ApplicationUpdate.php @@ -37,9 +37,6 @@ public function __construct($parameters, ProjectConfiguration $configuration) $this->projectConfiguration = $configuration; } - /** - * @param ConsoleCommandEvent $event - */ public function onCommandAction(ConsoleCommandEvent $event) { $env = $this->parameters['env']; diff --git a/src/Listener/CommandException.php b/src/Listener/CommandException.php index 2999264..9638707 100644 --- a/src/Listener/CommandException.php +++ b/src/Listener/CommandException.php @@ -13,9 +13,6 @@ */ class CommandException { - /** - * @param ConsoleErrorEvent $event - */ public function onExceptionAction(ConsoleErrorEvent $event) { //@todo logs diff --git a/src/Listener/CommandStart.php b/src/Listener/CommandStart.php index 4b69481..1c46fa9 100644 --- a/src/Listener/CommandStart.php +++ b/src/Listener/CommandStart.php @@ -15,9 +15,6 @@ */ class CommandStart { - /** - * @param ConsoleCommandEvent $event - */ public function onCommandAction(ConsoleCommandEvent $event) { /** @var Command $command */ diff --git a/src/Listener/CommandTerminate.php b/src/Listener/CommandTerminate.php index 9490920..251cb71 100644 --- a/src/Listener/CommandTerminate.php +++ b/src/Listener/CommandTerminate.php @@ -15,9 +15,6 @@ */ class CommandTerminate { - /** - * @param ConsoleTerminateEvent $event - */ public function onTerminateAction(ConsoleTerminateEvent $event) { /** @var Command $command */ diff --git a/src/Listener/OSXListener.php b/src/Listener/OSXListener.php index f8ddf71..9e932db 100644 --- a/src/Listener/OSXListener.php +++ b/src/Listener/OSXListener.php @@ -28,9 +28,6 @@ public function __construct($optimizers) $this->optimizers = $optimizers; } - /** - * @param ConsoleCommandEvent $event - */ public function onCommandAction(ConsoleCommandEvent $event) { if (!EZ_ON_OSX) { From 2be29a924dfe1bf137bea18789b71947736ac965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Sun, 5 Aug 2018 12:47:01 -0700 Subject: [PATCH 5/7] Update dependencies --- composer.lock | 224 ++++++++++++++++++++++++++------------------------ 1 file changed, 116 insertions(+), 108 deletions(-) diff --git a/composer.lock b/composer.lock index 65a0ba5..252a846 100644 --- a/composer.lock +++ b/composer.lock @@ -64,16 +64,16 @@ }, { "name": "nesbot/carbon", - "version": "1.30.0", + "version": "1.32.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "863a1a651ea324e1838da3a52753a4239b9d4bea" + "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/863a1a651ea324e1838da3a52753a4239b9d4bea", - "reference": "863a1a651ea324e1838da3a52753a4239b9d4bea", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/64563e2b9f69e4db1b82a60e81efa327a30ff343", + "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343", "shasum": "" }, "require": { @@ -85,6 +85,13 @@ "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] + } + }, "autoload": { "psr-4": { "": "src/" @@ -108,7 +115,7 @@ "datetime", "time" ], - "time": "2018-06-15T11:52:26+00:00" + "time": "2018-07-05T06:59:26+00:00" }, { "name": "novactive/collection", @@ -387,16 +394,16 @@ }, { "name": "symfony/config", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "73e055cf2e6467715f187724a0347ea32079967c" + "reference": "7b08223b7f6abd859651c56bcabf900d1627d085" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/73e055cf2e6467715f187724a0347ea32079967c", - "reference": "73e055cf2e6467715f187724a0347ea32079967c", + "url": "https://api.github.com/repos/symfony/config/zipball/7b08223b7f6abd859651c56bcabf900d1627d085", + "reference": "7b08223b7f6abd859651c56bcabf900d1627d085", "shasum": "" }, "require": { @@ -447,20 +454,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-05-14T16:49:53+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/console", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27" + "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/36f83f642443c46f3cf751d4d2ee5d047d757a27", - "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27", + "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73", + "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73", "shasum": "" }, "require": { @@ -516,20 +523,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-05-16T08:49:21+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/debug", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68" + "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/b28fd73fefbac341f673f5efd707d539d6a19f68", - "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68", + "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc", + "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc", "shasum": "" }, "require": { @@ -572,20 +579,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-05-16T14:03:39+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8a4672aca8db6d807905d695799ea7d83c8e5bba" + "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8a4672aca8db6d807905d695799ea7d83c8e5bba", - "reference": "8a4672aca8db6d807905d695799ea7d83c8e5bba", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1c0e679e522591fd744fdf242fec41a43d62b2b1", + "reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1", "shasum": "" }, "require": { @@ -643,20 +650,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-05-25T11:57:15+00:00" + "time": "2018-07-29T15:19:31+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8" + "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8", - "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb", + "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb", "shasum": "" }, "require": { @@ -706,20 +713,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-04-06T07:35:25+00:00" + "time": "2018-07-26T09:06:28+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0" + "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0", - "reference": "8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/a59f917e3c5d82332514cb4538387638f5bde2d6", + "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6", "shasum": "" }, "require": { @@ -756,20 +763,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-05-16T08:49:21+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/finder", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "472a92f3df8b247b49ae364275fb32943b9656c6" + "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/472a92f3df8b247b49ae364275fb32943b9656c6", - "reference": "472a92f3df8b247b49ae364275fb32943b9656c6", + "url": "https://api.github.com/repos/symfony/finder/zipball/8a84fcb207451df0013b2c74cbbf1b62d47b999a", + "reference": "8a84fcb207451df0013b2c74cbbf1b62d47b999a", "shasum": "" }, "require": { @@ -805,20 +812,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-05-16T08:49:21+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/options-resolver", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e" + "reference": "6debc476953a45969ab39afe8dee0b825f356dc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f3109a6aedd20e35c3a33190e932c2b063b7b50e", - "reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/6debc476953a45969ab39afe8dee0b825f356dc7", + "reference": "6debc476953a45969ab39afe8dee0b825f356dc7", "shasum": "" }, "require": { @@ -859,7 +866,7 @@ "configuration", "options" ], - "time": "2018-01-11T07:56:07+00:00" + "time": "2018-07-26T08:45:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -977,16 +984,16 @@ }, { "name": "symfony/process", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187" + "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187", - "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187", + "url": "https://api.github.com/repos/symfony/process/zipball/0414db29bd770ec5a4152683e655f55efd4fa60f", + "reference": "0414db29bd770ec5a4152683e655f55efd4fa60f", "shasum": "" }, "require": { @@ -1022,20 +1029,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-05-16T08:49:21+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/translation", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "7047f725e35eab768137c677f8c38e4a2a8e38fb" + "reference": "9749930bfc825139aadd2d28461ddbaed6577862" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/7047f725e35eab768137c677f8c38e4a2a8e38fb", - "reference": "7047f725e35eab768137c677f8c38e4a2a8e38fb", + "url": "https://api.github.com/repos/symfony/translation/zipball/9749930bfc825139aadd2d28461ddbaed6577862", + "reference": "9749930bfc825139aadd2d28461ddbaed6577862", "shasum": "" }, "require": { @@ -1090,20 +1097,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-05-21T10:06:52+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" + "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", - "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", + "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", + "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", "shasum": "" }, "require": { @@ -1149,7 +1156,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-05-03T23:18:14+00:00" + "time": "2018-07-26T11:19:56+00:00" } ], "packages-dev": [ @@ -1654,16 +1661,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.12.1", + "version": "v2.12.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6" + "reference": "dcc87d5414e9d0bd316fce81a5bedb9ce720b183" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/beef6cbe6dec7205edcd143842a49f9a691859a6", - "reference": "beef6cbe6dec7205edcd143842a49f9a691859a6", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/dcc87d5414e9d0bd316fce81a5bedb9ce720b183", + "reference": "dcc87d5414e9d0bd316fce81a5bedb9ce720b183", "shasum": "" }, "require": { @@ -1697,7 +1704,7 @@ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", - "phpunitgoodpractices/traits": "^1.5", + "phpunitgoodpractices/traits": "^1.5.1", "symfony/phpunit-bridge": "^4.0" }, "suggest": { @@ -1741,7 +1748,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-06-10T08:26:56+00:00" + "time": "2018-07-06T10:37:40+00:00" }, { "name": "mikey179/vfsStream", @@ -1836,16 +1843,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.15", + "version": "v2.0.17", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09" + "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09", - "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d", + "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d", "shasum": "" }, "require": { @@ -1881,7 +1888,7 @@ "pseudorandom", "random" ], - "time": "2018-06-08T15:26:40+00:00" + "time": "2018-07-04T16:31:37+00:00" }, { "name": "pdepend/pdepend", @@ -2188,16 +2195,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.6", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712" + "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712", - "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4ba436b55987b4bf311cb7c6ba82aa528aac0a06", + "reference": "4ba436b55987b4bf311cb7c6ba82aa528aac0a06", "shasum": "" }, "require": { @@ -2209,12 +2216,12 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { @@ -2247,7 +2254,7 @@ "spy", "stub" ], - "time": "2018-04-18T13:57:24+00:00" + "time": "2018-08-05T17:53:17+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3232,16 +3239,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e" + "reference": "31db283fc86d3143e7ff87e922177b457d909c30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/e63c12699822bb3b667e7216ba07fbcc3a3e203e", - "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/31db283fc86d3143e7ff87e922177b457d909c30", + "reference": "31db283fc86d3143e7ff87e922177b457d909c30", "shasum": "" }, "require": { @@ -3284,7 +3291,7 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/polyfill-php70", @@ -3402,16 +3409,16 @@ }, { "name": "symfony/stopwatch", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af" + "reference": "deda2765e8dab2fc38492e926ea690f2a681f59d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/eb17cfa072cab26537ac37e9c4ece6c0361369af", - "reference": "eb17cfa072cab26537ac37e9c4ece6c0361369af", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/deda2765e8dab2fc38492e926ea690f2a681f59d", + "reference": "deda2765e8dab2fc38492e926ea690f2a681f59d", "shasum": "" }, "require": { @@ -3447,20 +3454,20 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2018-02-17T14:55:25+00:00" + "time": "2018-07-26T10:03:52+00:00" }, { "name": "symfony/twig-bridge", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "03fd0a95d3cdcfa54863fca0baf589a5c8766508" + "reference": "5d9401bc36c5a8006901e990b6884f5990c87920" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/03fd0a95d3cdcfa54863fca0baf589a5c8766508", - "reference": "03fd0a95d3cdcfa54863fca0baf589a5c8766508", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5d9401bc36c5a8006901e990b6884f5990c87920", + "reference": "5d9401bc36c5a8006901e990b6884f5990c87920", "shasum": "" }, "require": { @@ -3469,7 +3476,7 @@ }, "conflict": { "symfony/console": "<3.4", - "symfony/form": "<3.4.9|<4.0.9,>=4.0" + "symfony/form": "<3.4.13|>=4.0,<4.0.13|>=4.1,<4.1.2" }, "require-dev": { "symfony/asset": "~2.8|~3.0|~4.0", @@ -3477,7 +3484,7 @@ "symfony/dependency-injection": "~2.8|~3.0|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/form": "^3.4.9|^4.0.9", + "symfony/form": "^3.4.13|~4.0.13|^4.1.2", "symfony/http-foundation": "^3.3.11|~4.0", "symfony/http-kernel": "~3.2|~4.0", "symfony/polyfill-intl-icu": "~1.0", @@ -3537,20 +3544,20 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2018-05-21T10:06:52+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.4.11", + "version": "v3.4.14", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73" + "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0e6545672d8c9ce70dd472adc2f8b03155a46f73", - "reference": "0e6545672d8c9ce70dd472adc2f8b03155a46f73", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f62a394bd3de96f2f5e8f4c7d685035897fb3cb3", + "reference": "f62a394bd3de96f2f5e8f4c7d685035897fb3cb3", "shasum": "" }, "require": { @@ -3606,24 +3613,25 @@ "debug", "dump" ], - "time": "2018-04-26T12:42:15+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "twig/twig", - "version": "v1.35.3", + "version": "v1.35.4", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f" + "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f", - "reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a", + "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "psr/container": "^1.0", @@ -3662,16 +3670,16 @@ }, { "name": "Twig Team", - "homepage": "http://twig.sensiolabs.org/contributors", + "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", + "homepage": "https://twig.symfony.com", "keywords": [ "templating" ], - "time": "2018-03-20T04:25:58+00:00" + "time": "2018-07-13T07:12:17+00:00" }, { "name": "webmozart/assert", From 5d50e0965f6d1083aba32d886d727822213867ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Sun, 5 Aug 2018 16:19:40 -0700 Subject: [PATCH 6/7] cronjob enable by default --- payload/platformsh/.platform.app.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/payload/platformsh/.platform.app.yaml b/payload/platformsh/.platform.app.yaml index a25a035..3063243 100644 --- 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: From 857d991f1881b3bbe4a1163d367e858240eb57da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morel=20Se=CC=81bastien?= Date: Sun, 5 Aug 2018 16:20:05 -0700 Subject: [PATCH 7/7] X-Debug configuration --- payload/dev/engine/php.ini | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/payload/dev/engine/php.ini b/payload/dev/engine/php.ini index 13baaa9..8b5a30e 100644 --- a/payload/dev/engine/php.ini +++ b/payload/dev/engine/php.ini @@ -19,5 +19,17 @@ sendmail_path = /usr/bin/env catchmail --smtp-ip mailcatcher --smtp-port 1025 -f 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" + +