Skip to content
This repository was archived by the owner on Nov 5, 2022. It is now read-only.

Update composer packages #34

Merged
merged 14 commits into from
Mar 4, 2021
Merged

Update composer packages #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4fd1f9c
Merge pull request #21 from bcit-ci/develop
louisl Dec 12, 2017
4f1b5de
Build: rename the phpunit config file
jrfnl Sep 11, 2018
00e9973
Merge pull request #24 from jrfnl/feature/rename-phpunit-config-file
lonnieezell Sep 11, 2018
34ef326
set project type to "phpcodesniffer-standard"
Jan 2, 2020
3efdfb1
Merge pull request #29 from KhairulA/master
lonnieezell Feb 17, 2020
4e2e802
Require usage of elseif instead of else if
michalsn Aug 16, 2020
db3d7d7
Merge pull request #30 from michalsn/elseif_sniff
louisl Aug 19, 2020
e5d0ce3
chore: update phpcodesniffer-composer-installer version
kenjis Mar 2, 2021
44767ce
chore: remove composer.lock
kenjis Mar 2, 2021
b53a333
chore: update PHP versions to check
kenjis Mar 2, 2021
0aba7a0
style: coding style
kenjis Mar 2, 2021
e0c8d9f
chore: update travis.yml for Xdebug3
kenjis Mar 2, 2021
e8b2f93
chore: update phpunit to ^7.0 and add `composer test` command
kenjis Mar 2, 2021
0f9e3e6
chore: drop php8
kenjis Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
composer.phar
/vendor/
/build
phpunit.xml
10 changes: 8 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ env:
- STANDARD="CodeIgniter4"
# Upload covarage to coveralls.
- COVERALLS="1"
# Xdebug3 needs this.
- XDEBUG_MODE=coverage

matrix:
fast_finish: true
Expand All @@ -27,7 +29,11 @@ matrix:
# aliased to a recent 7.x version
# - php: '7.0'
# aliased to a recent 7.x version
- php: '7.1'
# - php: '7.1'
- php: '7.2'
- php: '7.3'
- php: '7.4'
# - php: '8.0'
# aliased to a recent hhvm version
# - php: 'hhvm'
# php nightly
Expand Down Expand Up @@ -64,4 +70,4 @@ script:
- ./vendor/bin/phpunit --debug --filter $STANDARD

after_success:
- if [[ "$COVERALLS" == "1" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/coverage/clover/clover.xml; fi
- if [[ "$COVERALLS" == "1" && "$TRAVIS_PHP_VERSION" == "7.4" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/coverage/clover/clover.xml; fi
189 changes: 94 additions & 95 deletions CodeIgniter4/Sniffs/Arrays/ArrayDeclarationSniff.php
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions CodeIgniter4/Sniffs/Commenting/ClassCommentSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,52 +30,52 @@ class ClassCommentSniff extends FileCommentSniff
*
* @var array
*/
protected $tags = array(
'@package' => array(
'required' => true,
'allow_multiple' => false,
),
'@subpackage' => array(
'required' => false,
'allow_multiple' => false,
),
'@category' => array(
'required' => false,
'allow_multiple' => false,
),
'@author' => array(
'required' => false,
'allow_multiple' => true,
),
'@copyright' => array(
'required' => false,
'allow_multiple' => true,
),
'@license' => array(
'required' => false,
'allow_multiple' => false,
),
'@link' => array(
'required' => false,
'allow_multiple' => true,
),
'@since' => array(
'required' => false,
'allow_multiple' => false,
),
'@version' => array(
'required' => false,
'allow_multiple' => false,
),
'@see' => array(
'required' => false,
'allow_multiple' => true,
),
'@deprecated' => array(
'required' => false,
'allow_multiple' => false,
),
);
protected $tags = [
'@package' => [
'required' => true,
'allow_multiple' => false,
],
'@subpackage' => [
'required' => false,
'allow_multiple' => false,
],
'@category' => [
'required' => false,
'allow_multiple' => false,
],
'@author' => [
'required' => false,
'allow_multiple' => true,
],
'@copyright' => [
'required' => false,
'allow_multiple' => true,
],
'@license' => [
'required' => false,
'allow_multiple' => false,
],
'@link' => [
'required' => false,
'allow_multiple' => true,
],
'@since' => [
'required' => false,
'allow_multiple' => false,
],
'@version' => [
'required' => false,
'allow_multiple' => false,
],
'@see' => [
'required' => false,
'allow_multiple' => true,
],
'@deprecated' => [
'required' => false,
'allow_multiple' => false,
],
];


/**
Expand All @@ -85,10 +85,10 @@ class ClassCommentSniff extends FileCommentSniff
*/
public function register()
{
return array(
T_CLASS,
T_INTERFACE,
);
return [
T_CLASS,
T_INTERFACE,
];

}//end register()

Expand All @@ -108,7 +108,7 @@ public function process(File $phpcsFile, $stackPtr)

$tokens = $phpcsFile->getTokens();
$type = strtolower($tokens[$stackPtr]['content']);
$errorData = array($type);
$errorData = [$type];

$find = Tokens::$methodPrefixes;
$find[] = T_WHITESPACE;
Expand Down
Loading