MCLOUD-7466: Enable validate_timestamps for developer mode (#26)

oshmyheliuk · web-flow · commit 6fb4a8fb0835 · 2021-01-15T14:35:21.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -86,7 +86,9 @@ before_install:
   # https://github.com/kylekatarnls/update-helper/issues/9
   - if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;
 
-install: if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
+install:
+  - phpenv config-add travis.php.ini
+  - if [[ $TEST_SUITE != "build-images" ]]; then composer update; fi;
 
 before_script:
   - if [ $TRAVIS_SECURE_ENV_VARS == "true" ] && ([ $TEST_SUITE == "build-images" ] || [ $TEST_SUITE == "functional" ]); then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin; fi;
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-docker",
     "description": "Magento Cloud Docker",
     "type": "magento2-component",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -68,6 +68,10 @@
                 "dist/mutagen.sh",
                 "mutagen.sh"
             ],
+            [
+                "dist/php.dev.ini",
+                "php.dev.ini"
+            ],
             [
                 "dist/mnt",
                 ".docker/mnt"
diff --git a/dist/php.dev.ini b/dist/php.dev.ini
@@ -0,0 +1,2 @@
+; configuration for development mode
+opcache.validate_timestamps = 1
diff --git a/images/php/7.2-cli/docker-entrypoint.sh b/images/php/7.2-cli/docker-entrypoint.sh
@@ -54,6 +54,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/images/php/7.2-fpm/docker-entrypoint.sh b/images/php/7.2-fpm/docker-entrypoint.sh
@@ -46,6 +46,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/images/php/7.3-cli/docker-entrypoint.sh b/images/php/7.3-cli/docker-entrypoint.sh
@@ -54,6 +54,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/images/php/7.3-fpm/docker-entrypoint.sh b/images/php/7.3-fpm/docker-entrypoint.sh
@@ -46,6 +46,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/images/php/7.4-cli/docker-entrypoint.sh b/images/php/7.4-cli/docker-entrypoint.sh
@@ -54,6 +54,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/images/php/7.4-fpm/docker-entrypoint.sh b/images/php/7.4-fpm/docker-entrypoint.sh
@@ -46,6 +46,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/images/php/cli/docker-entrypoint.sh b/images/php/cli/docker-entrypoint.sh
@@ -54,6 +54,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/images/php/fpm/docker-entrypoint.sh b/images/php/fpm/docker-entrypoint.sh
@@ -46,6 +46,9 @@ fi
 # Add custom php.ini if it exists
 [ -f "/app/php.ini" ] && cp /app/php.ini ${PHP_EXT_DIR}/zzz-custom-php.ini
 
+# Add developer php.ini if it exists
+[ -f "/app/php.dev.ini" ] && [ "$MAGENTO_RUN_MODE" == "developer" ] && cp /app/php.dev.ini ${PHP_EXT_DIR}/zzz-dev-php.ini
+
 # Enable PHP extensions
 PHP_EXT_COM_ON=docker-php-ext-enable
 
diff --git a/src/Test/Functional/Acceptance/DeveloperCest.php b/src/Test/Functional/Acceptance/DeveloperCest.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CloudDocker\Test\Functional\Acceptance;
+
+use CliTester;
+
+/**
+ * @group php74
+ */
+class DeveloperCest extends AbstractCest
+{
+    /**
+     * Template version for testing
+     */
+    protected const TEMPLATE_VERSION = '2.4.1';
+
+    /**
+     * Tests that php settings contains configuration from php.dev.ini
+     *
+     * @param CliTester $I
+     * @throws \Robo\Exception\TaskException
+     */
+    public function testDevPhpIni(CliTester $I)
+    {
+        $I->generateDockerCompose('--mode=developer');
+        $I->replaceImagesWithCustom();
+        $I->startEnvironment();
+
+        $I->runDockerComposeCommand('run deploy php -i | grep opcache.validate_timestamps');
+        $I->seeInOutput('=> On');
+
+        $I->runDockerComposeCommand('run fpm php -i | grep opcache.validate_timestamps');
+        $I->seeInOutput('=> On');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+; configuration for development mode`
	`2`	`+opcache.validate_timestamps = 1`