Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Nov 5, 2022. It is now read-only.

Commit 113687c

Browse files
authored
Merge pull request #34 from kenjis/update-composer.json
Update composer packages
2 parents fb7bc37 + 0f9e3e6 commit 113687c

29 files changed

+483
-2600
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
composer.phar
22
/vendor/
33
/build
4+
phpunit.xml

‎.travis.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ env:
1212
- STANDARD="CodeIgniter4"
1313
# Upload covarage to coveralls.
1414
- COVERALLS="1"
15+
# Xdebug3 needs this.
16+
- XDEBUG_MODE=coverage
1517

1618
matrix:
1719
fast_finish: true
@@ -27,7 +29,11 @@ matrix:
2729
# aliased to a recent 7.x version
2830
# - php: '7.0'
2931
# aliased to a recent 7.x version
30-
- php: '7.1'
32+
# - php: '7.1'
33+
- php: '7.2'
34+
- php: '7.3'
35+
- php: '7.4'
36+
# - php: '8.0'
3137
# aliased to a recent hhvm version
3238
# - php: 'hhvm'
3339
# php nightly
@@ -64,4 +70,4 @@ script:
6470
- ./vendor/bin/phpunit --debug --filter $STANDARD
6571

6672
after_success:
67-
- if [[ "$COVERALLS" == "1" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/coverage/clover/clover.xml; fi
73+
- if [[ "$COVERALLS" == "1" && "$TRAVIS_PHP_VERSION" == "7.4" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/coverage/clover/clover.xml; fi

‎CodeIgniter4/Sniffs/Arrays/ArrayDeclarationSniff.php‎

Lines changed: 94 additions & 95 deletions
Large diffs are not rendered by default.

‎CodeIgniter4/Sniffs/Commenting/ClassCommentSniff.php‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -30,52 +30,52 @@ class ClassCommentSniff extends FileCommentSniff
3030
*
3131
* @var array
3232
*/
33-
protected $tags = array(
34-
'@package' => array(
35-
'required' => true,
36-
'allow_multiple' => false,
37-
),
38-
'@subpackage' => array(
39-
'required' => false,
40-
'allow_multiple' => false,
41-
),
42-
'@category' => array(
43-
'required' => false,
44-
'allow_multiple' => false,
45-
),
46-
'@author' => array(
47-
'required' => false,
48-
'allow_multiple' => true,
49-
),
50-
'@copyright' => array(
51-
'required' => false,
52-
'allow_multiple' => true,
53-
),
54-
'@license' => array(
55-
'required' => false,
56-
'allow_multiple' => false,
57-
),
58-
'@link' => array(
59-
'required' => false,
60-
'allow_multiple' => true,
61-
),
62-
'@since' => array(
63-
'required' => false,
64-
'allow_multiple' => false,
65-
),
66-
'@version' => array(
67-
'required' => false,
68-
'allow_multiple' => false,
69-
),
70-
'@see' => array(
71-
'required' => false,
72-
'allow_multiple' => true,
73-
),
74-
'@deprecated' => array(
75-
'required' => false,
76-
'allow_multiple' => false,
77-
),
78-
);
33+
protected $tags = [
34+
'@package' => [
35+
'required' => true,
36+
'allow_multiple' => false,
37+
],
38+
'@subpackage' => [
39+
'required' => false,
40+
'allow_multiple' => false,
41+
],
42+
'@category' => [
43+
'required' => false,
44+
'allow_multiple' => false,
45+
],
46+
'@author' => [
47+
'required' => false,
48+
'allow_multiple' => true,
49+
],
50+
'@copyright' => [
51+
'required' => false,
52+
'allow_multiple' => true,
53+
],
54+
'@license' => [
55+
'required' => false,
56+
'allow_multiple' => false,
57+
],
58+
'@link' => [
59+
'required' => false,
60+
'allow_multiple' => true,
61+
],
62+
'@since' => [
63+
'required' => false,
64+
'allow_multiple' => false,
65+
],
66+
'@version' => [
67+
'required' => false,
68+
'allow_multiple' => false,
69+
],
70+
'@see' => [
71+
'required' => false,
72+
'allow_multiple' => true,
73+
],
74+
'@deprecated' => [
75+
'required' => false,
76+
'allow_multiple' => false,
77+
],
78+
];
7979

8080

8181
/**
@@ -85,10 +85,10 @@ class ClassCommentSniff extends FileCommentSniff
8585
*/
8686
public function register()
8787
{
88-
return array(
89-
T_CLASS,
90-
T_INTERFACE,
91-
);
88+
return [
89+
T_CLASS,
90+
T_INTERFACE,
91+
];
9292

9393
}//end register()
9494

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

109109
$tokens = $phpcsFile->getTokens();
110110
$type = strtolower($tokens[$stackPtr]['content']);
111-
$errorData = array($type);
111+
$errorData = [$type];
112112

113113
$find = Tokens::$methodPrefixes;
114114
$find[] = T_WHITESPACE;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /