Merge remote-tracking branch 'upstream/master'

.platform.app.yaml

@@ -102,11 +102,15 @@ hooks:
         find var/cache/prod -mindepth 1 -maxdepth 1 -type d \! \( -name "$PLATFORM_TREE_ID" \) -exec rm -rf '{}' \;
 
 # The configuration of scheduled execution.
-# see http://symfony.com/doc/current/components/console/introduction.html
-#crons:
-#    symfony:
-#        spec: "*/20 * * * *"
-#        cmd: "php bin/console ezpublish:cron:run"
+# see https://docs.platform.sh/configuration/app/cron.html#cron-jobs
+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:

app/config/env/platformsh.php

@@ -3,6 +3,13 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader;
 
+// Run for all hooks, incl build step
+if (getenv('PLATFORM_PROJECT_ENTROPY')) {
+    // Disable PHPStormPass as we don't have write access & it's not localhost
+    $container->setParameter('ezdesign.phpstorm.enabled', false);
+}
+
+// Will not be executed on build step
 $relationships = getenv('PLATFORM_RELATIONSHIPS');
 if (!$relationships) {
     return;
@@ -110,6 +117,3 @@
         $container->setParameter('session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
     }
 }
-
-// Disable PHPStormPass
-$container->setParameter('ezdesign.phpstorm.enabled', false);

composer.json

@@ -108,7 +108,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "2.2.x-dev"
+            "dev-master": "2.3.x-dev"
         }
     }
 }