joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-24 22:39:31 +00:00
Code Packages Releases Activity

[4.0] Updating to PHPCS3 (#25548)

Browse Source 
* Updating to PHPCS3

* Fixing phpcs call

* Excluding a bunch of files

* Using the cms-coding-standard alpha2 release
This commit is contained in:
Hannes Papenberg 2019-07-19 17:26:12 +02:00 committed by Robert Deutz
parent c9c83aebbd
commit 2f2e237050
6 changed files with 34 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -31,9 +31,7 @@ steps:
depends_on: [ composer ]
commands:
- echo $(date)
- ./libraries/vendor/bin/phpcs --config-set installed_paths ../../joomla/cms-coding-standards/lib,../../joomla/coding-standards/Joomla/ExampleRulesets,../../joomla/coding-standards
- ./libraries/vendor/bin/phpcs --config-set colors 1
- ./libraries/vendor/bin/phpcs --config-set php_version 70200
- ./libraries/vendor/bin/phpcs --config-set installed_paths ../../joomla/cms-coding-standards/lib,../../joomla/coding-standards
- ./libraries/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php --ignore=libraries/vendor/*,tests/*,build/*,node_modules/*,media/*,libraries/autoload_psr4.php,installation/template/error.php -p --standard=libraries/vendor/joomla/cms-coding-standards/lib/Joomla-CMS .
- echo $(date)
@ -257,6 +255,6 @@ services:
---
kind: signature
hmac: 25e452206bc4a115142bddb1758d1dfb6c056977ffbabc7d0b87afa432d60d28
hmac: ec40511e747c1a260fa14fb56e32d93eeea1ed9ac2b90f6372e543792c41a401
...

2
administrator/components/com_languages/Model/InstalledModel.php
View File

@ -51,7 +51,7 @@ class InstalledModel extends ListModel
protected $data = null;
/**
* @var int total number of languages
* @var integer total number of languages
*/
protected $total = null;

6
composer.json
View File

@ -101,11 +101,11 @@
},
"require-dev": {
"phpunit/phpunit": "~8.0",
"joomla/cms-coding-standards": "~2.0.0-alpha@dev",
"joomla/coding-standards": "~2.0@dev",
"joomla/cms-coding-standards": "~2.0.0-alpha2@dev",
"joomla/coding-standards": "~3.0@dev",
"joomla/mediawiki": "dev-master",
"friendsofphp/php-cs-fixer": "~2.12",
"squizlabs/php_codesniffer": "~2.8",
"squizlabs/php_codesniffer": "~3.0",
"joomla-projects/joomla-browser": "~4.0@dev",
"joomla-projects/robo-joomla": "dev-develop",
"joomla-projects/selenium-server-standalone": "~v3",

77
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "adcc362beafa040a632f3236a01578f4",
"content-hash": "bfc6490bb10b548e5d1181cd62a8852a",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@ -5404,16 +5404,16 @@
},
{
"name": "joomla/cms-coding-standards",
"version": "2.0.0-alpha",
"version": "2.0.0-alpha2",
"source": {
"type": "git",
"url": "https://github.com/joomla/cms-coding-standards.git",
"reference": "b8d0b3e24bf1695871830a68c4545cecc5f3b08b"
"reference": "25abae52f9167fa47ce57331bbece8079ad27ab3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla/cms-coding-standards/zipball/b8d0b3e24bf1695871830a68c4545cecc5f3b08b",
"reference": "b8d0b3e24bf1695871830a68c4545cecc5f3b08b",
"url": "https://api.github.com/repos/joomla/cms-coding-standards/zipball/25abae52f9167fa47ce57331bbece8079ad27ab3",
"reference": "25abae52f9167fa47ce57331bbece8079ad27ab3",
"shasum": ""
},
"require": {
@ -5455,25 +5455,25 @@
"php codesniffer",
"phpcs"
],
"time": "2019-05-25T19:39:56+00:00"
"time": "2019-07-13T18:56:54+00:00"
},
{
"name": "joomla/coding-standards",
"version": "dev-master",
"version": "dev-3.x-dev",
"source": {
"type": "git",
"url": "https://github.com/joomla/coding-standards.git",
"reference": "bcd5ae7cdc35549706a3d5ace3d67a0c3e0fd052"
"reference": "fc041ba4352689d0834fc3f6bce14edc6e40aebe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla/coding-standards/zipball/bcd5ae7cdc35549706a3d5ace3d67a0c3e0fd052",
"reference": "bcd5ae7cdc35549706a3d5ace3d67a0c3e0fd052",
"url": "https://api.github.com/repos/joomla/coding-standards/zipball/fc041ba4352689d0834fc3f6bce14edc6e40aebe",
"reference": "fc041ba4352689d0834fc3f6bce14edc6e40aebe",
"shasum": ""
},
"require": {
"php": ">=5.3.10",
"squizlabs/php_codesniffer": "^2.8.0"
"php": ">=5.4.0",
"squizlabs/php_codesniffer": "^3.4"
},
"require-dev": {
"phpunit/phpunit": "^4.8.7"
@ -5481,7 +5481,7 @@
"type": "phpcodesniffer-standard",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
"dev-3.x-dev": "3.0-dev"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -5502,7 +5502,7 @@
"php codesniffer",
"phpcs"
],
"time": "2019-07-12T08:45:51+00:00"
"time": "2019-07-12T10:04:53+00:00"
},
{
"name": "joomla/mediawiki",
@ -7026,64 +7026,37 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "2.9.2",
"version": "3.4.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "2acf168de78487db620ab4bc524135a13cfe6745"
"reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745",
"reference": "2acf168de78487db620ab4bc524135a13cfe6745",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
"reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
"shasum": ""
},
"require": {
"ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
"php": ">=5.1.2"
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"bin": [
"scripts/phpcs",
"scripts/phpcbf"
"bin/phpcs",
"bin/phpcbf"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
"dev-master": "3.x-dev"
}
},
"autoload": {
"classmap": [
"CodeSniffer.php",
"CodeSniffer/CLI.php",
"CodeSniffer/Exception.php",
"CodeSniffer/File.php",
"CodeSniffer/Fixer.php",
"CodeSniffer/Report.php",
"CodeSniffer/Reporting.php",
"CodeSniffer/Sniff.php",
"CodeSniffer/Tokens.php",
"CodeSniffer/Reports/",
"CodeSniffer/Tokenizers/",
"CodeSniffer/DocGenerators/",
"CodeSniffer/Standards/AbstractPatternSniff.php",
"CodeSniffer/Standards/AbstractScopeSniff.php",
"CodeSniffer/Standards/AbstractVariableSniff.php",
"CodeSniffer/Standards/IncorrectPatternException.php",
"CodeSniffer/Standards/Generic/Sniffs/",
"CodeSniffer/Standards/MySource/Sniffs/",
"CodeSniffer/Standards/PEAR/Sniffs/",
"CodeSniffer/Standards/PSR1/Sniffs/",
"CodeSniffer/Standards/PSR2/Sniffs/",
"CodeSniffer/Standards/Squiz/Sniffs/",
"CodeSniffer/Standards/Zend/Sniffs/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
@ -7095,12 +7068,12 @@
}
],
"description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
"homepage": "http://www.squizlabs.com/php-codesniffer",
"homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
"keywords": [
"phpcs",
"standards"
],
"time": "2018-11-07T22:31:41+00:00"
"time": "2019-04-10T23:49:02+00:00"
},
{
"name": "symfony/browser-kit",

4
libraries/joomla/base/adapter.php
View File

@ -120,7 +120,7 @@ class JAdapter extends JObject
* Set an adapter by name
*
* @param string $name Adapter name
* @param object &$adapter Adapter object
* @param object $adapter Adapter object
* @param array $options Adapter options
*
* @return boolean True if successful
@ -197,7 +197,7 @@ class JAdapter extends JObject
{
$files = new DirectoryIterator($this->_basepath . '/' . $this->_adapterfolder);
/* @type $file DirectoryIterator */
/** @type $file DirectoryIterator */
foreach ($files as $file)
{
$fileName = $file->getFilename();

2
libraries/src/Schema/ChangeItem.php
View File

@ -107,7 +107,7 @@ abstract class ChangeItem
/**
* Rerun status
*
* @var int 0=not rerun, -1=skipped, -2=failed, 1=succeeded
* @var integer 0=not rerun, -1=skipped, -2=failed, 1=succeeded
* @since 2.5
*/
public $rerunStatus = 0;