Merge branch '1.9.4.x' into cleanup/media

.github/workflows/php.yml

@@ -0,0 +1,31 @@
+name: PHP Composer
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: php version
+      run: php --version
+
+    - name: composer version
+      run: composer --version
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    # - name: Run test suite
+    #   run: composer run-script test

.github/workflows/static-code-analyses.yml

@@ -0,0 +1,61 @@
+name: "Static Code Analyses"
+on:
+  push:
+  pull_request:
+
+
+jobs:
+  php_syntax:
+    name: PHP Syntax ${{ matrix.php-versions }}
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      max-parallel: 5
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.0', '7.1', '7.2', '7.3']
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extension-csv: mbstring #optional, setup extensions
+          ini-values-csv: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
+          coverage: none #optional, setup coverage driver
+          pecl: true #optional, setup PECL
+      - name: Check PHP Version
+        run: php -v
+      - name: Check .php files
+        run: '! find . -not \( -path ./.phpstorm.meta.php -prune \) -not \( -path ./lib/PEAR -prune \) -not \( -path ./lib/phpseclib -prune \) -not \( -path ./lib/Zend -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"'
+      - name: Check .phtml files
+        run: '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"'
+
+  php_syntax_experimental:
+    name: PHP Syntax ${{ matrix.php-versions }} - experimental
+    runs-on: ${{ matrix.operating-system }}
+    needs: php_syntax
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.4', '8.0']
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extension-csv: mbstring #optional, setup extensions
+          ini-values-csv: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
+          coverage: none #optional, setup coverage driver
+          pecl: true #optional, setup PECL
+      - name: Check PHP Version
+        run: php -v
+      - name: Check .php files
+        continue-on-error: true
+        run: '! find . -not \( -path ./.phpstorm.meta.php -prune \) -not \( -path ./lib/PEAR -prune \) -not \( -path ./lib/phpseclib -prune \) -not \( -path ./lib/Zend -prune \) -type f -name "*.php" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"'
+      - name: Check .phtml files
+        continue-on-error: true
+        run: '! find app/design -type f -name "*.phtml" -exec php -d error_reporting=32767 -l {} \; 2>&1 1> /dev/null | grep "^"'
+

.htaccess

@@ -32,10 +32,8 @@
 <IfModule mod_php5.c>
 
 ############################################
-## adjust memory limit
+## adjust max execution time
 
-#    php_value memory_limit 64M
-    php_value memory_limit 256M
     php_value max_execution_time 18000
 
 ############################################
@@ -71,14 +69,10 @@
 ## see above for php_flag descriptions
 
 <IfModule mod_php7.c>
-    #php_value memory_limit 64M
-    php_value memory_limit 256M
     php_value max_execution_time 18000
-    php_flag magic_quotes_gpc off
     php_flag session.auto_start off
     #php_flag zlib.output_compression on
     php_flag suhosin.session.cryptua off
-    php_flag zend.ze1_compatibility_mode Off
 </IfModule>
 
 <IfModule mod_security.c>
@@ -216,9 +210,17 @@
 ############################################
 ## Add default Expires header
 ## http://developer.yahoo.com/performance/rules.html#expires
-
-    ExpiresDefault "access plus 1 year"
-
+    ExpiresActive On
+    ExpiresByType image/jpg "access plus 1 year"
+    ExpiresByType image/jpeg "access plus 1 year"
+    ExpiresByType image/gif "access plus 1 year"
+    ExpiresByType image/png "access plus 1 year"
+    ExpiresByType text/css "access plus 1 month"
+    ExpiresByType application/pdf "access plus 1 month"
+    ExpiresByType text/x-javascript "access plus 1 month"
+    ExpiresByType application/x-shockwave-flash "access plus 1 month"
+    ExpiresByType image/x-icon "access plus 1 year"
+    ExpiresDefault "access plus 2 days"
 </IfModule>
 
 ############################################

.htaccess.sample

@@ -29,9 +29,8 @@
 <IfModule mod_php5.c>
 
 ############################################
-## adjust memory limit
+## adjust max execution time
 
-    php_value memory_limit 512M
     php_value max_execution_time 18000
 
 ############################################