Re-adding PHP 7.0 support, which works for most commands #155
+94
−13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicolas-grekas
approved these changes
Apr 19, 2018
stof
reviewed
Apr 19, 2018
src/Maker/MakeEntity.php
Outdated
| @@ -110,6 +110,10 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma | |||
|
|
|||
| public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator) | |||
| { | |||
| if (version_compare(PHP_VERSION, '7.1.0') < 0) { | |||
There was a problem hiding this comment.
use \PHP_VERSION_ID instead, as done in Symfony.
src/Test/MakerTestCase.php
Outdated
|
|
||
| class MakerTestCase extends TestCase | ||
| { | ||
| protected function executeMakerCommand(MakerTestDetails $testDetails) | ||
| { | ||
| if ($testDetails->getMaker() instanceof MakeEntity && version_compare(PHP_VERSION, '7.1.0') < 0) { |
There was a problem hiding this comment.
This MakerTestCase is a reusable one for any maker (including third-party ones). Hardcoding a special case for MakeEntity looks weird to me. I suggest adding a way to mark the test as skipped in MakerTestDetails instead.
src/Util/ClassSourceManipulator.php
Outdated
| @@ -504,7 +504,11 @@ private function addStatementToConstructor(Node\Stmt $stmt) | |||
| $this->updateSourceCodeFromNewStmts(); | |||
| } | |||
|
|
|||
| private function getConstructorNode(): ?Node\Stmt\ClassMethod | |||
| /** | |||
| * @return null|Node\Stmt\ClassMethod | |||
There was a problem hiding this comment.
we generally put |null at the end in Symfony.
stof
reviewed
Apr 19, 2018
src/Test/MakerTestCase.php
Outdated
| if ($testDetails->getMaker() instanceof MakeEntity && version_compare(PHP_VERSION, '7.1.0') < 0) { | ||
| $this->markTestSkipped('MakeEntity tests require 7.1 or higher'); | ||
| if (!$testDetails->isSupportedByCurrentPhpVersion()) { | ||
| $this->markTestSkipped(); |
src/Test/MakerTestDetails.php
Outdated
| @@ -245,4 +254,9 @@ public function isCommandAllowedToFail(): bool | |||
| { | |||
| return $this->commandAllowedToFail; | |||
| } | |||
|
|
|||
| public function isSupportedByCurrentPhpVersion() | |||
weaverryan
force-pushed
the
re-add-70-support
branch
from
57808d5 to
043efcf
Compare
weaverryan
added a commit
that referenced
this pull request
Apr 19, 2018
…weaverryan) This PR was squashed before being merged into the 1.0-dev branch (closes #155). Discussion ---------- Re-adding PHP 7.0 support, which works for most commands PHP 7.0 support was removed when I updated the make:entity command. This is because the make:entity command generates PHP 7.1+ compatible code only (it uses nullable ?). But, having 7.0 support is easy... because 7.1 is only needed for this one command. Commits ------- 043efcf Re-adding PHP 7.0 support, which works for most commands
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PHP 7.0 support was removed when I updated the make:entity command. This is because the make:entity command generates PHP 7.1+ compatible code only (it uses nullable ?).
But, having 7.0 support is easy... because 7.1 is only needed for this one command.