Merge pull request #462 from continuouspipe/feature/fix-opcache-validate-timestamps-always-being-1

Fix Opcache's validate_timestamps setting always being 1

Author: kierenevans

php/shared/usr/local/share/env/40-stack

@@ -8,7 +8,10 @@ export PHP_TIMEZONE=${PHP_TIMEZONE:-UTC}
 export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-256M}
 export PHP_OPCACHE_MAX_ACCELERATED_FILES=${PHP_OPCACHE_MAX_ACCELERATED_FILES:-2000}
 export PHP_OPCACHE_MEMORY_CONSUMPTION=${PHP_OPCACHE_MEMORY_CONSUMPTION:-64}
-export PHP_OPCACHE_VALIDATE_TIMESTAMPS=${PHP_OPCACHE_VALIDATE_TIMESTAMPS:-1}
+if [ -z "$PHP_OPCACHE_VALIDATE_TIMESTAMPS" ]; then
+  export PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
+  export PHP_OPCACHE_VALIDATE_TIMESTAMPS_IS_DEFAULT="true"
+fi
 export PHP_OPCACHE_ENABLE_CLI=${PHP_OPCACHE_ENABLE_CLI:0}
 export PHP_REALPATH_CACHE_SIZE=${PHP_REALPATH_CACHE_SIZE:-16K}
 export PHP_REALPATH_CACHE_TTL=${PHP_REALPATH_CACHE_TTL:-120}

php/shared/usr/local/share/env/55-stack

@@ -27,6 +27,6 @@ if [ -z "$DEVELOPMENT_MODE" ] || [ "$DEVELOPMENT_MODE" != 'true' ]; then
 fi
 export COMPOSER_INSTALL_FLAGS=${COMPOSER_INSTALL_FLAGS:-$DEFAULT_COMPOSER_FLAGS}
 
-if [ "$DEVELOPMENT_MODE" != "true" ]; then
+if [ "$DEVELOPMENT_MODE" != "true" ] && [ "$PHP_OPCACHE_VALIDATE_TIMESTAMPS_IS_DEFAULT" == "true" ]; then
   export PHP_OPCACHE_VALIDATE_TIMESTAMPS=${PHP_OPCACHE_VALIDATE_TIMESTAMPS:-0}
 fi