From 7f22201b93db402ad40c3bafc3ea72c414a6b808 Mon Sep 17 00:00:00 2001 From: Christian Blanquera Date: Sun, 28 Mar 2021 12:16:22 +0800 Subject: [PATCH 1/6] psr-2 fixes --- phpcs.xml | 33 +++++++++++++++++++++++++++------ src/OAuth/AbstractOAuth1.php | 8 ++++++-- src/Package/PackageTrait.php | 3 +-- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/phpcs.xml b/phpcs.xml index 607100f..cbff808 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,11 +1,32 @@ - The coding standard for PHP_CodeSniffer itself. + The coding standard for PHP_CodeSniffer itself. - src + src - - + + + - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/OAuth/AbstractOAuth1.php b/src/OAuth/AbstractOAuth1.php index 98acf0d..484923a 100644 --- a/src/OAuth/AbstractOAuth1.php +++ b/src/OAuth/AbstractOAuth1.php @@ -574,12 +574,16 @@ protected function getSignature(array $query = []): string { switch ($this->signature) { case self::HMAC_SHA1: - return $this->getHmacSha1Signature($query); + $signature = $this->getHmacSha1Signature($query); + break; case self::RSA_SHA1: case self::PLAIN_TEXT: default: - return $this->getHmacPlainTextSignature(); + $signature = $this->getHmacPlainTextSignature(); + break; } + + return $signature; } /** diff --git a/src/Package/PackageTrait.php b/src/Package/PackageTrait.php index 88a5b41..2d07139 100644 --- a/src/Package/PackageTrait.php +++ b/src/Package/PackageTrait.php @@ -93,8 +93,7 @@ public function register( string $vendor, ?string $root = null, ?string $bootstrap = null - ) - { + ) { //if no bootstrap file name defined and theres a getBootstrapFileName method if (is_null($bootstrap) && method_exists($this, 'getBootstrapFileName')) { //use that From a6ee8854d4495d018c8fd21f07e74f5ec3b19fee Mon Sep 17 00:00:00 2001 From: Christian Blanquera Date: Sun, 28 Mar 2021 12:50:49 +0800 Subject: [PATCH 2/6] ci config update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 988b4a8..ba55862 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: php php: - - 7.1 + - 8.0 install: - /home/travis/.phpenv/versions/7.1/bin/composer install - phpenv rehash From 7eca5d14cd04de160a5fbc20998257c37125e126 Mon Sep 17 00:00:00 2001 From: Christian Blanquera Date: Sun, 28 Mar 2021 13:19:49 +0800 Subject: [PATCH 3/6] ci config update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ba55862..645001a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php php: - 8.0 install: - - /home/travis/.phpenv/versions/7.1/bin/composer install + - /home/travis/.phpenv/versions/8.0/bin/composer install - phpenv rehash before_script: - mkdir -p build/logs From 9c5d82708cdcfa968287a4bcf8c6bfaafb920a11 Mon Sep 17 00:00:00 2001 From: Christian Blanquera Date: Sun, 28 Mar 2021 15:16:59 +0800 Subject: [PATCH 4/6] ci config update --- .travis.yml | 5 ++++- phpunit.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 645001a..ecabd94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: php php: - 8.0 +env: + global: + - XDEBUG_MODE=coverage install: - /home/travis/.phpenv/versions/8.0/bin/composer install - phpenv rehash @@ -8,5 +11,5 @@ before_script: - mkdir -p build/logs script: - vendor/bin/phpcs - - vendor/bin/phpunit --coverage-clover build/logs/clover.xml + - XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-clover build/logs/clover.xml - php vendor/bin/php-coveralls -v diff --git a/phpunit.xml b/phpunit.xml index 32a187b..5928b2c 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -116,7 +116,7 @@ - + ./src From 57d38c718f82cacd8ef248208add0d83881ef6a5 Mon Sep 17 00:00:00 2001 From: Christian Blanquera Date: Sun, 28 Mar 2021 15:24:14 +0800 Subject: [PATCH 5/6] test update --- test/Data/Collection.php | 2 +- test/Data/Model.php | 2 +- test/Data/Registry.php | 2 +- test/Event/EventEmitter.php | 2 +- test/Event/EventTrait.php | 2 +- test/Http/Router/RouterTrait.php | 2 +- test/I18n/Language.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/Data/Collection.php b/test/Data/Collection.php index 9957067..2a99487 100644 --- a/test/Data/Collection.php +++ b/test/Data/Collection.php @@ -433,7 +433,7 @@ public function testSetEventEmitter() } /** - * @covers UGComponents\Data\Collection::trigger + * @covers UGComponents\Data\Collection::emit */ public function testTrigger() { diff --git a/test/Data/Model.php b/test/Data/Model.php index 48b1293..15cc205 100644 --- a/test/Data/Model.php +++ b/test/Data/Model.php @@ -362,7 +362,7 @@ public function testSetEventEmitter() } /** - * @covers UGComponents\Data\Model::trigger + * @covers UGComponents\Data\Model::emit */ public function testTrigger() { diff --git a/test/Data/Registry.php b/test/Data/Registry.php index c0efad6..9c04254 100644 --- a/test/Data/Registry.php +++ b/test/Data/Registry.php @@ -387,7 +387,7 @@ public function testSetEventEmitter() } /** - * @covers UGComponents\Data\Registry::trigger + * @covers UGComponents\Data\Registry::emit */ public function testTrigger() { diff --git a/test/Event/EventEmitter.php b/test/Event/EventEmitter.php index e68d6fd..8cb07ea 100644 --- a/test/Event/EventEmitter.php +++ b/test/Event/EventEmitter.php @@ -124,7 +124,7 @@ public function testOn() } /** - * @covers UGComponents\Event\EventEmitter::trigger + * @covers UGComponents\Event\EventEmitter::emit */ public function testTrigger() { diff --git a/test/Event/EventTrait.php b/test/Event/EventTrait.php index 6fbc7ef..95cc9dc 100644 --- a/test/Event/EventTrait.php +++ b/test/Event/EventTrait.php @@ -118,7 +118,7 @@ public function testSetEventEmitter() } /** - * @covers UGComponents\Event\EventTrait::trigger + * @covers UGComponents\Event\EventTrait::emit */ public function testEmit() { diff --git a/test/Http/Router/RouterTrait.php b/test/Http/Router/RouterTrait.php index d03cd55..439c2f3 100644 --- a/test/Http/Router/RouterTrait.php +++ b/test/Http/Router/RouterTrait.php @@ -105,7 +105,7 @@ public function testSetRouter() } /** - * covers UGComponents\Http\RouterTrait::triggerRoute + * covers UGComponents\Http\RouterTrait::routeTo */ public function testRouteTo() { diff --git a/test/I18n/Language.php b/test/I18n/Language.php index 7a9284c..19ca7f1 100644 --- a/test/I18n/Language.php +++ b/test/I18n/Language.php @@ -330,7 +330,7 @@ public function testSetEventEmitter() } /** - * @covers UGComponents\I18n\Language::trigger + * @covers UGComponents\I18n\Language::emit */ public function testTrigger() { From 3fd7b8c362891908a8f2fa689dd76f2ec76a2ea8 Mon Sep 17 00:00:00 2001 From: Christian Blanquera Date: Sun, 28 Mar 2021 15:30:11 +0800 Subject: [PATCH 6/6] test update --- test/Data/CloneTrait.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Data/CloneTrait.php b/test/Data/CloneTrait.php index ea132a4..281c164 100644 --- a/test/Data/CloneTrait.php +++ b/test/Data/CloneTrait.php @@ -33,7 +33,6 @@ protected function tearDown(): void /** * @covers UGComponents\Data\CloneTrait::clone - * @covers UGComponents\Data\CloneTrait::__clone */ public function testClone() {