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

Implemented PHPStan + Propel2 beta2 #26

Merged
merged 14 commits into from
Sep 14, 2022
Merged

Conversation

davyrolink
Copy link

@davyrolink davyrolink commented Sep 13, 2022

I firstly implemented PHPStan, then upgraded Propel2 to beta2, fixed a few bugs along the way.

This merge will also resolve: #23 #19 #22

I've only upgraded the 5.1 branch. The differences between the 5.1 and the 6.0 branch seem small, so it shouldn't be too hard to merge into 6.0 and resolve the conflicts (that will resolve #24).
Manually tested with Symfony 4.4 and 5.4
PHP dependency is 7.4+ (just like Propel2 beta2) for the 5.1 branch

For reference: the previous pull request #25 was a merge to the 5.0 branch. As discussed; the idea is to keep the 5.0 branch PHP 7.2+ compatible, the new 5.1 branch will require PHP 7.4+

@davyrolink
Copy link
Author

davyrolink commented Sep 13, 2022

I think it would be good to add PHPStan to the CI, but personally I have too little experience with the GitHub CI workflows. The PHPStan command is just: vendor/bin/phpstan analyse

@SkyFoxvn
Copy link
Owner

i have no experience with PHPStan so i will not implement it right now and usually libs of this kind added to CI make extra commits, but i will check it when i have time it may be useful.

i will need 1 or 2 days to check the code before i merge it if i find some problems i will tell you.
and again tnx very much for the help :)

@SkyFoxvn SkyFoxvn merged commit 65f31fe into SkyFoxvn:5.1 Sep 14, 2022
SkyFoxvn added a commit that referenced this pull request Sep 14, 2022
* composer require --dev phpstan/phpstan phpstan/extension-installer phpstan/phpstan-deprecation-rules

* Added phpstan.neon

* Fixed phpstan errors

* Bump to php 7.4 in preparation for beta2 requirement

* Fixed phpstan errors

* Fixed phpstan errors

* Fixed phpstan errors

* Fixed phpstan errors

* composer require propel/propel:2.0.0-beta2

* fixes related to beta2 upgrade

* php 7.4 is required for propelorm/Propel2/tree/2.0.0-beta2

* fixes for Symfony 4.4

* bugfix: getPlatform may return null

* Conditional adding alias of profiler service

Co-authored-by: Davy Rolink <[email protected]>
# Conflicts:
#	.github/workflows/CI 6.0.yml
#	README.markdown
#	Tests/Fixtures/Model/Base/BookQuery.php
#	composer.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants