2018-02-26 AC: Merges branch '2.2.0-codefreeze'.

Author: andrewscaya

.codeclimate.yml

@@ -1,7 +1,40 @@
 ---
+version: "2"         # required to adjust maintainability checks
+checks:
+  argument-count:
+    config:
+      threshold: 15
+  complex-logic:
+    config:
+      threshold: 15
+  file-lines:
+    config:
+      threshold: 1500
+  method-complexity:
+    config:
+      threshold: 50
+  method-count:
+    config:
+      threshold: 50
+  method-lines:
+    config:
+      threshold: 150
+  nested-control-flow:
+    config:
+      threshold: 4
+  return-statements:
+    config:
+      threshold: 5
+  similar-code:
+    config:
+      threshold: # language-specific defaults. an override will affect all languages.
+  identical-code:
+    config:
+      threshold: # language-specific defaults. an override will affect all languages.
+
 engines:
   duplication:
-    enabled: true
+    enabled: false
     config:
       languages:
         php:
@@ -10,19 +43,38 @@ engines:
     enabled: true
     config:
       standard: PSR2
+    checks:
+      PSR1 Files SideEffects FoundWithSymbols:
+        enabled: false
+      PSR1 Classes ClassDeclaration MissingNamespace:
+        enabled: false
+      Squiz Classes ValidClassName NotCamelCaps:
+        enabled: false
 
 ratings:
   paths:
   - "**.php"
 
-exclude_paths:
-  - "bin/"
-  - "build/"
-  - "docs/"
-  - "docs-api/"
-  - "language_files/"
-  - "lib/"
-  - "sef/"
-  - "tests/"
-  - "tmpl/"
-  - "vendor/"
+exclude_patterns:
+- "config/"
+- "db/"
+- "dist/"
+- "features/"
+- "**/node_modules/"
+- "script/"
+- "**/spec/"
+- "**/test/"
+- "**/tests/"
+- "**/vendor/"
+- "**/*_test.go"
+- "**/*.d.ts"
+- "bin/"
+- "build/"
+- "data/"
+- "docs/"
+- "docs-api/"
+- "language_files/"
+- "lib/"
+- "sef/"
+- "tests/"
+- "tmpl/"

.travis.yml

@@ -1,69 +1,76 @@
-branches:
-  except:
-    - 1.8.9
-    - 1.8.8
-    - 1.8.7
-    - develop
+env:
+  global:
+    - SAUCE_USERNAME=andrewscaya
+    - secure: "Cwt3tdw/XN4MX/rLxCh23Af6y6GOKccX/YTPCQUAJDkKvUDqPtM/Q0PnCQwHdOfhmliFsP9QVZzrv3cZrpggNrjU5cctc+w9GsdMogZlEULaV3sa4DgXHjfrTniguOh2YsZQ3tcTQkL/jH3mJ6FiY+8zZOGJvMEydyFp5u06khW/ahmot6EVkXt6+4dswtfckTaQZiXBdOdjyZ9lMbnjEpeLp7Ed0FqQDdq9GZK0M9weurEHZwLhClXzyMhHMA4GolvYCFR9+a1WBU3T/c3GJjMfVLjqvW3l5MzI1/ShFeC8/mXaaWfzNobo+x6Iv3CNUB657dRBxFr2PFvIx8GQYZXG1q7WBUrONoXZFUqEdUYHMTly/vGYkiMXfXYJAHpAuRmEHTyprYFDc7TtnPGC3bq5eqmUwZlE3Sjm0HnDQWhwpzVr0yTqccr3cXPNBrK9xLMTLo0sbGHRMvJLt7LltNd1dkuRNoo5sPedYK46pZQLaJ5sKWCHMNBBnVVHXJzjdaoRdFk2NY2Y9E8PMiqRl68kHl2hs7pSUu+QhrC0bPLGcf8cVxko/foPAbXDYQalG+T1zsbrPHhb5ZvE8Un3IZF6Gpl1QeYqbD0HWbm/chHy+0oXiIvRAESxoQtv505if1u8NszHYZVL0+Cj/dkKunwhZoIhr+DHsGyAsfE8RnU="
+    - secure: "fatMNhRKgFgwcE0AY1kcuL/hC7698iOta96kotcpBT4kCrIJ0HjlhVWzh94JzSYl0MaiSU0hgi/KG1Goo/8byEbkB3TYrw/gasJLontbl6aCVPNi/HRS4uD2kvB6NzqNzkvX9zd4L/MjZzOJc0CGR/EbO/gVhXYqodL8Qbj5Kdwlodx7Aa4CIC0vF+WiwArQWqIFWPoRG81dgxd0Ze95fOQwLYfSuwmm1IWor42oZLR4UnAEtIDDcuCVKEeADgPWsTIUZP+05KhiMhE8sGV2kolp4FbG8yqFsGe06DfGTnCujFdPZINobEip7HmKhZQWmgC9/9QJLW1G+jcA2cwugk4/1hz0eiuFbVZcElY3yISwNOv3UrQX49FOZ83AiueqwODfhdaGBgVXStSj0f2lKPixRD5M/0dovHT0qDKB0C/OnBYDXtUW84U+dBi2LlQKRFZn5XJ2uDYGWnTsMIAbtttxdmMDg/9GXFWY+/5PXzTaD38+V+C1BGxI4/xfTk8Pm8sLJef08vm7apPv/x4k3YaBxIxVbXfg9UgN2mYcaQxJBMCOHxiRr77gHqmPmEAtRCVFWJ+t/e8UcCRReD2gYZ/WmTRnTz5YmaaaySA5yr+KpwRL/UczrY4R/0KxJnOONiBl3z6UM0f/ysufaAE7bAvr07YEm3IrYVUAsVHV0Ak="
 
 sudo: false
 
 language: php
 
 cache:
-    directories:
-        - $HOME/.composer/cache
-        - vendor
+  directories:
+    - $HOME/.composer/cache
+    - vendor
 
 services:
   - mysql
 
 addons:
-  firefox: "31.6"
+  sauce_connect: true
+
+branches:
+  except:
+    - 1.8.9
+    - 1.8.8
+    - 1.8.7
+    - develop
 
 matrix:
-    fast_finish: true
-    include:
-        - php: 5.5
-          env:
-            - COMPOSER_PROCESS_TIMEOUT=1200
-            - TEST_CHECK=true
-            - CS_CHECK=true
-            - CC_CHECK=false
-        - php: 5.6
-          env:
-            - COMPOSER_PROCESS_TIMEOUT=1200
-            - TEST_CHECK_COVER=true
-            - CS_CHECK=true
-            - CC_CHECK=false
-            - CODECLIMATE_REPO_TOKEN=cdf9d20bb5113bdc18f79b722ca5a54c965e2ccae2912ba40d92d0651cf8affa
-        - php: 7
-          env:
-            - TEST_CHECK=false
-            - CS_CHECK=true
-            - CC_CHECK=false
-        - php: hhvm
-    allow_failures:
-        - php: hhvm
-        
+  fast_finish: true
+  include:
+    - php: 5.5
+      env:
+        - COMPOSER_PROCESS_TIMEOUT=1200
+        - TEST_CHECK=true
+        - CS_CHECK=true
+        - CC_CHECK=true
+    - php: 5.6
+      env:
+        - COMPOSER_PROCESS_TIMEOUT=1200
+        - TEST_CHECK_COVER=true
+        - CS_CHECK=true
+        - CC_CHECK=true
+    - php: 7
+      env:
+        - TEST_CHECK=false
+        - CS_CHECK=true
+        - CC_CHECK=true
+    - php: hhvm
+      env:
+        - TEST_CHECK=false
+        - CS_CHECK=true
+        - CC_CHECK=false
+  allow_failures:
+    - php: hhvm
+
 before_install:
-    # XVFB
-    - "export DISPLAY=:99.0"
-    - "sh -e /etc/init.d/xvfb start"
-    - sleep 5 # give xvfb some time to start
-    - travis_retry composer self-update
-    - if [[ $TEST_CHECK_54 == 'true' ]]; then rm $TRAVIS_BUILD_DIR/composer.json && mv $TRAVIS_BUILD_DIR/composer.php54.json $TRAVIS_BUILD_DIR/composer.json ; fi
-    - if [[ -z "$TEST_CHECK_COVER" ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-    - if [[ $CC_CHECK == 'true' ]]; then $TRAVIS_BUILD_DIR/bin/codeception-setup.sh ; fi
-    - sleep 5 # gives enough time to Selenium to start
+  - travis_retry composer self-update
+  - if [[ $TEST_CHECK_54 == 'true' ]]; then rm $TRAVIS_BUILD_DIR/composer.json && mv $TRAVIS_BUILD_DIR/composer.php54.json $TRAVIS_BUILD_DIR/composer.json ; fi
+  - if [[ -z "$TEST_CHECK_COVER" ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
-    - travis_retry composer install --no-interaction
-    
+  - travis_retry composer install --no-interaction
+
+before_script:
+  - if [[ $CC_CHECK == 'true' ]]; then $TRAVIS_BUILD_DIR/bin/selenium-setup.sh ; fi
+  - if [[ $CC_CHECK == 'true' ]]; then npm install -g se-interpreter ; fi
+
 script:
-    - if [[ $TEST_CHECK == 'true' || $TEST_CHECK_54 == 'true' ]]; then composer test ; fi
-    - if [[ $TEST_CHECK_COVER == 'true' ]]; then composer test-cover ; fi
-    - if [[ $CS_CHECK == 'true' ]]; then composer cs ; fi
-    - if [[ $CC_CHECK == 'true' ]]; then composer cc ; fi
+  - if [[ $CC_CHECK == 'true' ]]; then se-interpreter tests/selenium/se-interpreter_config.json ; fi
+  - if [[ $TEST_CHECK == 'true' || $TEST_CHECK_54 == 'true' ]]; then composer test ; fi
+  - if [[ $TEST_CHECK_COVER == 'true' ]]; then composer test-cover ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs ; fi
 
 after_success:
-    - if [[ $TEST_CHECK_COVER == 'true' ]]; then composer test-report ; fi
+  - if [[ $TEST_CHECK_COVER == 'true' ]]; then composer test-report ; fi

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.2.0 (2018-02-23)
+
+- Fixes issue #16 - Language overrides do not work in SEF 1.8.9 and Joomla 3.6.5.
+- Fixes all functional tests by having them run on the Sauce Labs Selenium Server.
+- Fixes a minor issue with the upload error messages.
+
 ## 2.1.0 (2017-12-22)
 
 - Fixes issue #15 - Allow users to configure an automated reply email to those submitting the form.

README.md

@@ -7,5 +7,4 @@ Basic email contact form which lets you define up to eight (8) configurable fiel
 [![Test Coverage](https://codeclimate.com/github/andrewscaya/mod_simpleemailform/badges/coverage.svg)](https://codeclimate.com/github/andrewscaya/mod_simpleemailform)
 [![Issue Count](https://codeclimate.com/github/andrewscaya/mod_simpleemailform/badges/issue_count.svg)](https://codeclimate.com/github/andrewscaya/mod_simpleemailform)
 [![PDS Skeleton](https://img.shields.io/badge/pds-skeleton-blue.svg?style=flat-square)](https://github.com/php-pds/skeleton)
-
-Code coverage: SEFv2 100%.
+[![Documentation Status](https://readthedocs.org/projects/simple-email-form/badge/?version=stable)](http://simple-email-form.readthedocs.io/en/stable/?badge=stable)

bin/codeception-setup.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+cd /tmp
+#wget http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar
+#java -Xms40m -Xmx256m -jar /tmp/selenium-server-standalone-2.53.1.jar > /dev/null 2>&1 &
+wget -O joomla_3-8-5-stable-full_package.zip https://downloads.joomla.org/cms/joomla3/3-8-5/Joomla_3-8-5-Stable-Full_Package.zip?format=zip
+wget -O mod_simpleemailform-latest.tar.gz https://codeload.github.com/andrewscaya/mod_simpleemailform/tar.gz/latest
+mkdir joomla
+cd joomla
+unzip ../joomla_3-8-5-stable-full_package.zip
+mysql -uroot -e "CREATE DATABASE joomlatest;"
+(php -S localhost:8181 > /dev/null 2>&1) &
+exit 0

bin/selenium-setup.sh

@@ -40,9 +40,6 @@
         "codeclimate/php-test-reporter": "0.2.0",
         "satooshi/php-coveralls": "~0.6",
         "squizlabs/php_codesniffer": "^2.3",
-        "se/selenium-server-standalone": "^2.53",
-        "codeception/codeception": "^2.2",
-        "joomla-projects/joomla-browser": "v3.6.5.1",
         "phpdocumentor/phpdocumentor": "2.9.0",
         "pds/skeleton": "~1.0"
     },
@@ -57,23 +54,20 @@
             "./tests/unit"
         ],
         "exclude-from-classmap": [
-            "./vendor/codeception",
             "./vendor/joomla-projects",
             "./vendor/consolidation"
         ]
     },
     "scripts": {
         "check": [
             "@cs",
-            "@test",
-            "@cc"
+            "@test"
         ],
         "cs": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit",
         "test-cover": "phpunit --coverage-clover build/logs/clover.xml",
         "test-report": "test-reporter --coverage-report build/logs/clover.xml",
-        "cc": "codecept run acceptance",
         "apidocs": "phpdoc --template=responsive-twig"
     }
 }

codeception.yml

@@ -456,7 +456,7 @@ <h3>Response</h3>
             Template is built using <a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap 2</a> and icons provided by
             <a href="http://glyphicons.com/">Glyphicons</a>.<br/>
             Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and<br/>
-            generated on Sat, 16 Dec 2017 15:42:10 -0400.<br/>
+            generated on Fri, 23 Feb 2018 20:05:31 -0400.<br/>
     </footer>
     </body>
 </html>