Sync to staging

.appveyor.yml

@@ -0,0 +1,120 @@
+build: false
+platform:
+  - x64
+clone_folder: C:\projects\joomla-cms
+## Build matrix for lowest and highest possible targets
+environment:
+  matrix:
+  - php_ver_target: 5.6
+  - php_ver_target: 7.0
+  - php_ver_target: 7.1
+
+init:
+  - SET PATH=C:\Program Files\OpenSSL;C:\tools\php;%PATH%
+  - SET COMPOSER_NO_INTERACTION=1
+  - SET PHP=1 # This var relates to caching the php  install
+  - SET ANSICON=121x90 (121x90)
+services:
+  - mssql2014
+  - mysql
+  - postgresql94
+  - iis
+
+## Install PHP and composer, and run the appropriate composer command
+install:
+    - IF EXIST C:\tools\php (SET PHP=0)
+    - ps: >-
+        If ($env:php_ver_target -eq "5.6") {
+          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y --forcex86 php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+          $VC = "vc11"
+          $PHPBuild = "x86"
+        } Else {
+          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+          $VC = "vc14"
+          $PHPBuild = "x64"
+        }
+    - cinst -y sqlite
+    - cd C:\tools\php
+    # Get the MSSQL DLL's
+    - ps: >-
+        If ($env:PHP -eq "1") {
+          If ($env:php_ver_target -eq "5.6") {
+            appveyor DownloadFile https://files.nette.org/misc/php-sqlsrv.zip
+            7z x -y php-sqlsrv.zip > $null
+            copy SQLSRV\php_sqlsrv_56_nts.dll ext\php_sqlsrv_nts.dll
+            copy SQLSRV\php_pdo_sqlsrv_56_nts.dll ext\php_pdo_sqlsrv_nts.dll
+            Remove-Item C:\tools\php\* -include .zip
+          } Else {
+            $DLLVersion = "4.1.6.1"
+            cd c:\tools\php\ext
+            appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
+            7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
+            appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
+            7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
+            Remove-Item c:\tools\php\ext* -include .zip
+            cd c:\tools\php}}
+    - IF %PHP%==1 copy php.ini-production php.ini /Y
+    - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
+    - IF %PHP%==1 echo extension_dir=ext >> php.ini
+    - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_gd2.dll >> php.ini
+    - ps: >-
+        If ($env:php_ver_target -eq "5.6") {
+          Add-Content php.ini "`nextension=php_sqlsrv_nts.dll"
+          Add-Content php.ini "`nextension=php_pdo_sqlsrv_nts.dll"
+          Add-Content php.ini "`n"
+        } Else {
+          Add-Content php.ini "`nextension=php_sqlsrv.dll"
+          Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
+          Add-Content php.ini "`n"
+        }
+    - IF %PHP%==1 echo extension=php_pgsql.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_pdo_pgsql.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_sqlite3.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_pdo_mysql.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_mysqli.dll >> php.ini
+    - IF %PHP_VER_TARGET%==5.6 IF %PHP%==1 echo extension=php_mysql.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_curl.dll >> php.ini
+    # Get the Wincache DLLs
+    - ps: >-
+        If ($env:PHP -eq "1") {
+          If ($env:php_ver_target -eq "5.6") {$wincache = "1.3.7.12"} Else {$wincache = "2.0.0.8"}
+          cd c:\tools\php\ext
+          appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/wincache/$($wincache)/php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip
+          7z x -y php_wincache-$($wincache)-$($env:php_ver_target)-nts-$($VC)-$($PHPBuild).zip > $null
+          Remove-Item C:\tools\php\ext* -include .zip
+          cd c:\tools\php}
+    - IF %PHP%==1 echo extension=php_wincache.dll >> php.ini
+    - IF %PHP%==1 echo wincache.enablecli = 1 >> php.ini
+    - IF %PHP%==1 echo zend_extension=php_opcache.dll >> php.ini
+    - IF %PHP%==1 echo opcache.enable_cli=1 >> php.ini
+    - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
+    - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
+    - cd C:\projects\joomla-cms
+    - appveyor-retry composer install --no-progress --profile
+
+before_test:
+#  Database setup for MySQL via PowerShell tools
+  - >
+    "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS joomla_ut;"
+  - >
+    "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" joomla_ut < tests\unit\schema\mysql.sql
+
+#  Database setup for PostgreSQL
+  - SET PGUSER=postgres
+  - SET PGPASSWORD=Password12!
+  - PATH=C:\Program Files\PostgreSQL\9.4\bin\;%PATH%
+  - createdb joomla_ut
+  - psql -d joomla_ut -a -f tests\unit\schema\postgresql.sql
+
+# Database setup for SQL Server
+  - ps: $sqlInstance = "(local)\SQL2014"
+  - ps: sqlcmd -b -E -S "$sqlInstance" -Q "CREATE DATABASE joomla_ut"
+  - ps: sqlcmd -S "$sqlInstance" -U "sa" -P "Password12!" -i $env:APPVEYOR_BUILD_FOLDER\tests\unit\schema\sqlsrv.sql
+
+test_script:
+  - cd C:\projects\joomla-cms
+  - libraries/vendor/bin/phpunit -c appveyor-phpunit.xml

.drone.yml

@@ -1,16 +1,28 @@
-build:
-  image: joomlaprojects/docker-systemtests:latest
-  commands:
-    - apt-get install nodejs npm
-    - ln -s /usr/bin/nodejs /usr/bin/node
-    - export DISPLAY=:0
-    - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
-    - sleep 3
-    - fluxbox  > /dev/null 2>&1 &
-    - cd tests/javascript
-    - npm install
-    - cd ../..
-    - tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run
+pipeline:
   clone:
+    image: plugins/git
     depth: 1
-    path: repo
+
+  phpcs:
+    image: joomlaprojects/docker-phpcs
+    commands:
+      - echo $(date)
+      - /root/.composer/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .
+      - echo $(date)
+
+  javascript:
+    image: joomlaprojects/docker-systemtests:latest
+    commands:
+      - echo $(date)
+      - apt-get install nodejs npm
+      - ln -s /usr/bin/nodejs /usr/bin/node
+      - export DISPLAY=:0
+      - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
+      - sleep 3
+      - fluxbox  > /dev/null 2>&1 &
+      - cd tests/javascript
+      - npm install
+      - cd ../..
+      - tests/javascript/node_modules/karma/bin/karma start karma.conf.js --single-run
+      - echo $(date)
+

.github/CONTRIBUTING.md

@@ -21,4 +21,5 @@ There are other branches available which serve specific purposes.
 | ------ | ------- |
 | staging | Current codebase. Branch for the next minor Joomla version. New backward compatible features go into this branch. |
 | master | Each commit made to staging gets tested if it passes unit tests and codestyle rules. It is then merged into master. This is done automatically. |
-| 4.0-dev | Branch for the next major Joomla version. New backward incompatible features go into this branch. Commits to staging will be applied to this branch as well. |
+| 3.8.x | Branch for the next minor Joomla version. The 3.8.0 release will just include compatibility features for 4.0. Commits to staging will be applied to this branch as well. |
+| 4.0-dev | Branch for the next major Joomla version. New features go into this branch. Commits to staging will be applied to this branch as well. |

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,19 @@ Pull Request for Issue # .
 
 ### Summary of Changes
 
+
+
 ### Testing Instructions
 
+
+
+### Expected result
+
+
+
+### Actual result
+
+
+
 ### Documentation Changes Required
+

.gitignore

@@ -60,6 +60,7 @@ Desktop.ini
 /libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
 /libraries/vendor/ircmaxell/password-compat/README.md
 /libraries/vendor/ircmaxell/password-compat/version-test.php
+/libraries/vendor/joomla/*/.github
 /libraries/vendor/joomla/*/.gitignore
 /libraries/vendor/joomla/*/.gitmodules
 /libraries/vendor/joomla/*/docs
@@ -70,6 +71,7 @@ Desktop.ini
 /libraries/vendor/joomla/*/composer.json
 /libraries/vendor/joomla/*/phpunit.xml.dist
 /libraries/vendor/joomla/*/README.md
+/libraries/vendor/joomla/session/Joomla/Session/.github
 /libraries/vendor/joomla/session/Joomla/Session/_Tests
 /libraries/vendor/joomla/session/Joomla/Session/build
 /libraries/vendor/joomla/session/Joomla/Session/Tests

.travis.yml

@@ -79,4 +79,4 @@ script:
 
 branches:
   except:
-    - 2.5.x
+    - 2.5.x

README.md

@@ -201,4 +201,4 @@ Copyright
 * Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 * [Special Thanks](https://docs.joomla.org/Joomla!_Credits_and_Thanks)
 * Distributed under the GNU General Public License version 2 or later
-* See [License details](https://docs.joomla.org/Joomla_Licenses)
+* See [License details](https://docs.joomla.org/Joomla_Licenses)

README.txt

@@ -66,7 +66,7 @@
 	* Documentation for Web designers: https://docs.joomla.org/Web_designers
 
 Copyright:
-	* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+	* Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
 	* Special Thanks: https://docs.joomla.org/Joomla!_Credits_and_Thanks
 	* Distributed under the GNU General Public License version 2 or later
 	* See Licenses details at https://docs.joomla.org/Joomla_Licenses

administrator/components/com_admin/admin.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/admin.xml

@@ -3,7 +3,7 @@
 	<name>com_admin</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/components/com_admin/controller.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/controllers/profile.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/helpers/html/directory.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/helpers/html/phpsetting.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -63,11 +63,14 @@ public static function string($val)
 	 */
 	public static function integer($val)
 	{
-		JLog::add(
-			'JHtmlPhpSetting::integer() is deprecated. Use intval() or casting instead.',
-			JLog::WARNING,
-			'deprecated'
-		);
+		try
+		{
+			JLog::add(sprintf('%s() is deprecated. Use intval() or casting instead.', __METHOD__), JLog::WARNING, 'deprecated');
+		}
+		catch (RuntimeException $exception)
+		{
+			// Informational log only
+		}
 
 		return (int) $val;
 	}

administrator/components/com_admin/helpers/html/system.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/models/forms/profile.xml

@@ -53,7 +53,8 @@
 			label="COM_ADMIN_USER_FIELD_REGISTERDATE_LABEL"
 			description="COM_ADMIN_USER_FIELD_REGISTERDATE_DESC"
 			readonly="true"
-			format="%Y-%m-%d %H:%M:%S"
+			translateformat="true"
+			showtime="true"
 			size="22"
 			filter="user_utc"
 		/>
@@ -65,7 +66,8 @@
 			label="COM_ADMIN_USER_FIELD_LASTVISIT_LABEL"
 			description="COM_ADMIN_USER_FIELD_LASTVISIT_DESC"
 			readonly="true"
-			format="%Y-%m-%d %H:%M:%S"
+			translateformat="true"
+			showtime="true"
 			size="22"
 			filter="user_utc"
 		/>

administrator/components/com_admin/models/help.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/models/profile.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 

administrator/components/com_admin/models/sysinfo.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -313,7 +313,7 @@ public function &getInfo()
 			'sapi_name'             => php_sapi_name(),
 			'version'               => $version->getLongVersion(),
 			'platform'              => $platform->getLongVersion(),
-			'useragent'             => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "",
+			'useragent'             => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
 		);
 
 		return $this->info;
@@ -445,7 +445,17 @@ public function getExtensions()
 		}
 		catch (Exception $e)
 		{
-			JLog::add(JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()), JLog::WARNING, 'jerror');
+			try
+			{
+				JLog::add(JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()), JLog::WARNING, 'jerror');
+			}
+			catch (RuntimeException $exception)
+			{
+				JFactory::getApplication()->enqueueMessage(
+					JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()),
+					'warning'
+				);
+			}
 
 			return $installed;
 		}

administrator/components/com_admin/postinstall/eaccelerator.php

@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains post-installation message handling for eAccelerator compatibility.