Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernize codebase and add more code quality tools #449

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
38b6a09
Updated deps, fixed parsing
Jul 22, 2024
426d969
Updated deps
Jul 22, 2024
a33f15c
Updated github actions version
indy2kro Jul 22, 2024
ae9cc58
Updated actions versions
indy2kro Jul 22, 2024
f08d21e
Updated tests
indy2kro Jul 22, 2024
6698e39
Updated github actions to run only for php 8.3
indy2kro Jul 22, 2024
6538a52
Updated test
indy2kro Jul 22, 2024
1e42f71
Updated phpstan commands
indy2kro Jul 22, 2024
a881e12
Updated phpstan
indy2kro Jul 22, 2024
a478b19
Updated codecov config
indy2kro Jul 22, 2024
9980c91
Added CI/CD for php 8.1 and 8.2 as well
indy2kro Jul 22, 2024
da2850d
Removed php 8.1 from github actions
indy2kro Jul 22, 2024
4904bf2
Updated php deps
indy2kro Jul 22, 2024
63f5e85
Added rector
indy2kro Jul 22, 2024
80b6a0e
phpcs fix
indy2kro Jul 22, 2024
395d65e
Update special_cases.php
indy2kro Jul 22, 2024
53fe9a3
Update special_cases.php
indy2kro Jul 22, 2024
aea8889
Updated generated files
Jul 24, 2024
a87deb9
Fixed module ignore
Jul 24, 2024
3af9799
Rector fixes
Jul 24, 2024
c2f2e71
Regenerated
Jul 26, 2024
58e6a46
Automatically regenerate the files
indy2kro Aug 2, 2024
c960b1c
Merge pull request #2 from indy2kro/create-pull-request/regenerate-files
indy2kro Aug 2, 2024
b99f48b
Regenerated files
Aug 2, 2024
4416717
Automatically regenerate the files
indy2kro Aug 12, 2024
648b7c0
Merge pull request #3 from indy2kro/create-pull-request/regenerate-files
indy2kro Aug 12, 2024
a9fa9d9
Automatically regenerate the files
indy2kro Aug 21, 2024
f1a16f5
Merge pull request #4 from indy2kro/create-pull-request/regenerate-files
indy2kro Aug 21, 2024
349a85a
Automatically regenerate the files
indy2kro Aug 23, 2024
7f6f7b1
Merge pull request #5 from indy2kro/create-pull-request/regenerate-files
indy2kro Aug 23, 2024
fdb2c37
Automatically regenerate the files
indy2kro Aug 27, 2024
a9ec9eb
Merge pull request #6 from indy2kro/create-pull-request/regenerate-files
indy2kro Aug 27, 2024
091107d
Automatically regenerate the files
indy2kro Sep 12, 2024
4df7052
Merge pull request #7 from indy2kro/create-pull-request/regenerate-files
indy2kro Sep 12, 2024
0d7942c
Upgraded actions/upload-artifact@v3
Sep 12, 2024
dc915a9
Phpstan fixes
Sep 12, 2024
6aa5bd8
Automatically regenerate the files
indy2kro Sep 13, 2024
0d5792f
Merge pull request #8 from indy2kro/create-pull-request/regenerate-files
indy2kro Sep 13, 2024
80056b8
Automatically regenerate the files
indy2kro Sep 15, 2024
9eb8866
Merge pull request #9 from indy2kro/create-pull-request/regenerate-files
indy2kro Sep 15, 2024
b5ad0c1
Automatically regenerate the files
indy2kro Sep 22, 2024
f7cd281
Merge pull request #10 from indy2kro/create-pull-request/regenerate-f…
indy2kro Sep 22, 2024
b0e10fb
Automatically regenerate the files
indy2kro Sep 23, 2024
3987a40
Merge pull request #11 from indy2kro/create-pull-request/regenerate-f…
indy2kro Sep 23, 2024
de8a0d9
Automatically regenerate the files
indy2kro Sep 28, 2024
db268c2
Merge pull request #12 from indy2kro/create-pull-request/regenerate-f…
indy2kro Sep 28, 2024
b598a87
Automatically regenerate the files
indy2kro Sep 29, 2024
3637c20
Merge pull request #13 from indy2kro/create-pull-request/regenerate-f…
indy2kro Sep 29, 2024
f6c6c94
Automatically regenerate the files
indy2kro Oct 8, 2024
8623f79
Merge pull request #14 from indy2kro/create-pull-request/regenerate-f…
indy2kro Oct 8, 2024
4e19736
Automatically regenerate the files
indy2kro Oct 9, 2024
09765a4
Merge pull request #15 from indy2kro/create-pull-request/regenerate-f…
indy2kro Oct 10, 2024
f295d51
Rector fixes
Oct 10, 2024
d8cdfee
Automatically regenerate the files
indy2kro Oct 12, 2024
cd83e1b
Merge pull request #16 from indy2kro/create-pull-request/regenerate-f…
indy2kro Oct 12, 2024
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
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
-
package-ecosystem: composer
directory: "/"
schedule:
interval: weekly
versioning-strategy: auto
groups:
dev-dependencies:
dependency-type: "development"
10 changes: 5 additions & 5 deletions .github/workflows/auto-regenerate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v2"
with:
coverage: "pcov"
php-version: "8.0"
php-version: "8.3"

- name: "Check out salathe/phpdoc-base"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"
with:
path: "generator/doc/doc-en/doc-base"
repository: "salathe/phpdoc-base"

- name: "Check out php/doc-en"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"
with:
path: "generator/doc/doc-en/en"
repository: "php/doc-en"
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:

- name: "Create a pr if the files are different"
if: ${{ failure() }}
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v6
with:
commit-message: "Automatically regenerate the files"
branch: create-pull-request/regenerate-files
Expand Down
27 changes: 17 additions & 10 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.2"
- "8.3"

dependencies:
- "highest"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v2"
Expand All @@ -33,31 +34,32 @@ jobs:

- name: "Get current date for the daily cache"
id: 'date'
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
run: |
echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT

- name: "Cache the php documentation"
id: cache-php-doc
uses: "actions/cache@v1"
uses: "actions/cache@v4"
with:
path: "generator/doc/doc-en"
key: php-doc-${{ steps.date.outputs.date }}

- name: "Check out salathe/phpdoc-base"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"
if: steps.cache-php-doc.outputs.cache-hit != 'true'
with:
path: "generator/doc/doc-en/doc-base"
repository: "salathe/phpdoc-base"

- name: "Check out php/doc-en"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"
if: steps.cache-php-doc.outputs.cache-hit != 'true'
with:
path: "generator/doc/doc-en/en"
repository: "php/doc-en"

- name: "Cache dependencies installed with composer"
uses: "actions/cache@v1"
uses: "actions/cache@v4"
with:
path: "~/.composer/cache"
key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}"
Expand Down Expand Up @@ -85,6 +87,10 @@ jobs:
run: "composer phpstan"
working-directory: "generator"

- name: "Run static code analysis with rector/rector in generator/ directory"
run: "composer rector --dry-run"
working-directory: "generator"

- name: "Dump autoloader with composer in root directory"
run: "composer dump-autoload"

Expand Down Expand Up @@ -114,11 +120,12 @@ jobs:
fi

- name: "Archive code coverage results"
uses: "actions/upload-artifact@v1"
uses: "actions/upload-artifact@v3"
with:
name: "build"
path: "generator/build"

- uses: codecov/codecov-action@v1 # upload the coverage to codecov
- name: Upload coverage reports to Codecov
uses: codecov/[email protected]
with:
fail_ci_if_error: true # optional (default = false)
token: ${{ secrets.CODECOV_TOKEN }}
5 changes: 3 additions & 2 deletions .github/workflows/rector-continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "8.2"
- "8.3"

dependencies:
- "highest"

steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: "actions/checkout@v4"

- name: "Install PHP with extensions"
uses: "shivammathur/setup-php@v2"
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
/generator/doc/entities/generated.ent
/composer.lock
vendor/
/generator/composer.lock
/generator/tests/rector/composer.lock
/generator/.phpunit.cache/
.phpunit.result.cache
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"deprecated/mysqli.php",
"generated/apache.php",
"generated/apcu.php",
"generated/array.php",
"generated/bzip2.php",
"generated/calendar.php",
"generated/classobj.php",
Expand All @@ -43,7 +42,6 @@
"generated/ftp.php",
"generated/funchand.php",
"generated/gettext.php",
"generated/gmp.php",
"generated/gnupg.php",
"generated/hash.php",
"generated/ibase.php",
Expand Down Expand Up @@ -73,6 +71,7 @@
"generated/ps.php",
"generated/pspell.php",
"generated/readline.php",
"generated/rnp.php",
"generated/rpminfo.php",
"generated/rrd.php",
"generated/sem.php",
Expand Down Expand Up @@ -102,16 +101,17 @@
]
},
"require": {
"php": "^8.0"
"php": ">= 8.2",
"ext-intl": "*"
},
"require-dev": {
"phpstan/phpstan": "^1.5",
"phpstan/phpstan": "^1",
"thecodingmachine/phpstan-strict-rules": "^1.0",
"squizlabs/php_codesniffer": "^3.2",
"phpunit/phpunit": "^9.5"
"squizlabs/php_codesniffer": "^3",
"phpunit/phpunit": "^10.0 || ^11.0"
},
"scripts": {
"phpstan": "phpstan analyse lib -c phpstan.neon --level=max --no-progress -vvv",
"phpstan": "phpstan analyse",
"cs-fix": "phpcbf",
"cs-check": "phpcs"
},
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ApacheException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ApacheException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ApcuException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ApcuException extends \ErrorException implements SafeExceptionInterface
Expand Down
11 changes: 0 additions & 11 deletions generated/Exceptions/ArrayException.php

This file was deleted.

1 change: 1 addition & 0 deletions generated/Exceptions/Bzip2Exception.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class Bzip2Exception extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/CalendarException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class CalendarException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ClassobjException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ClassobjException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ComException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ComException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/CubridException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class CubridException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/DatetimeException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class DatetimeException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/DirException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class DirException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/EioException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class EioException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ErrorfuncException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ErrorfuncException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ExecException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ExecException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/FileinfoException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class FileinfoException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/FilesystemException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class FilesystemException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/FilterException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class FilterException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/FpmException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class FpmException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/FtpException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class FtpException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/FunchandException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class FunchandException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/GettextException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class GettextException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/GnupgException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class GnupgException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/HashException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class HashException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/IbaseException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class IbaseException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/IbmDb2Exception.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class IbmDb2Exception extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/IconvException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class IconvException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ImageException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ImageException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/ImapException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class ImapException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/InfoException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class InfoException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/InotifyException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class InotifyException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/LdapException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class LdapException extends \ErrorException implements SafeExceptionInterface
Expand Down
1 change: 1 addition & 0 deletions generated/Exceptions/LibxmlException.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

namespace Safe\Exceptions;

class LibxmlException extends \ErrorException implements SafeExceptionInterface
Expand Down
Loading