Skip to content

Commit

Permalink
Merge pull request #231 from PHPCSStandards/feature/minor-doc-fixes
Browse files Browse the repository at this point in the history
Minor documentation fixes
  • Loading branch information
jrfnl authored Jan 14, 2025
2 parents c7b4e64 + b6e46d4 commit 9711529
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:

include:
# Composer 2.3 drops support for PHP < 7.2, so for PHP 5.4 to 7.1, `v2` will install
# Composer 2.2, for PHP 7.2 and up, `v2` will install Composer 2.3.
# Composer 2.2, for PHP 7.2 and up, `v2` will install Composer >= 2.3.
# These builds make sure the Composer 2.2 LTS version is 100% supported for PHP 7.2-8.3.
# Note: Composer 2.2 is not compatible with PHP 8.4 and it is unlikely that it will be
# made compatible with PHP 8.4.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Thank you for being involved! :heart_eyes:
The original idea and setup of this repository is by [Franck Nijhof][frenck], employee @ Dealerdirect.
For a full list of all author and/or contributors, check [the contributors page][contributors].
For a full list of all authors and/or contributors, check [the contributors page][contributors].
## Funding
Expand Down
2 changes: 1 addition & 1 deletion tests/IntegrationTest/BaseLineTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function testBaseLineLocal($phpcsVersion, $expectedStnds)
* get displayed may differ depending on the machine/OS on which the tests get run.
* With that in mind, the verification that the PHPCS native standards are the only recognized standards
* is done using a regex instead of an exact match.
* Also see: https://github.com/squizlabs/PHP_CodeSniffer/pull/3539
* Also see: https://github.com/squizlabs/PHP_CodeSniffer/pull/3539 which was merged in PHPCS 3.7.0.
*
* @return array
*/
Expand Down
4 changes: 2 additions & 2 deletions tests/IntegrationTest/RegisterExternalStandardsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function testRegisterOneStandardGlobal($phpcsVersion)
static::$tempGlobalPath
);

// Verify that PHPCS can with the external standard set as the standard.
// Verify that PHPCS can run with the external standard set as the standard.
$phpcsCommand = '"vendor/bin/phpcs" --standard=DummySubDir -e';
$phpcsResult = $this->executeCliCommand($phpcsCommand, static::$tempGlobalPath);

Expand Down Expand Up @@ -181,7 +181,7 @@ public function testRegisterOneStandardLocal($phpcsVersion)
static::$tempLocalPath
);

// Verify that PHPCS can with the external standard set as the standard.
// Verify that PHPCS can run with the external standard set as the standard.
$phpcsCommand = '"vendor/bin/phpcs" --standard=DummySubDir -e';
$phpcsResult = $this->executeCliCommand($phpcsCommand, static::$tempLocalPath);

Expand Down

0 comments on commit 9711529

Please sign in to comment.