Added zend-code ^3.0.3 compatibility #63
Conversation
…native types - handled zend-code BC break in class extends resolution
rtek
changed the title
composer.json
Outdated
| @@ -25,14 +25,15 @@ | |||
| "symfony/config": "^2.2|^3.0|^4.0", | |||
| "goetas-webservices/xsd-reader": "^0.2|^0.3.1", | |||
| "doctrine/inflector": "^1.0", | |||
| "zendframework/zend-code": "~2.3", | |||
| "zendframework/zend-code": "~2.3|^3.0.3", | |||
There was a problem hiding this comment.
what about getting rid to the v2.3?
There was a problem hiding this comment.
Yes I can do that. Didn't want to alter the deps unless it was necessary.
tests/AbstractGenerator.php
Outdated
| @@ -34,7 +34,7 @@ public function __construct(array $targetNs, array $aliases = array(), $tmp = nu | |||
| $this->phpDir = "$tmp/php"; | |||
| $this->jmsDir = "$tmp/jms"; | |||
|
|
|||
| $this->namingStrategy = new ShortNamingStrategy(); | |||
| $this->namingStrategy = new VeryShortNamingStrategy(); | |||
There was a problem hiding this comment.
why changing this? and why a new naming strategy?
There was a problem hiding this comment.
The test case using the OTA schema was resulting in so many nested directories that mkdir was failing for being "too long". I put the strategy in the test directory as a workaround.
There was a problem hiding this comment.
GoetasWebservices\Xsd\XsdToPhp\PathGenerator\PathGeneratorException: Can't create the 'C:\Users\.........\AppData\Local\Temp/php/ota/RFPResponseType/RFPResponseSegmentsAType/RFPResponseSegmentAType/SitesAType/SiteAType/DatesAType/DateAType/RoomBlockAType/StayDatesAType/StayDateAType/StayDateRoomsAType/StayDateRoomAType/RatesAType' directory: 'mkdir(): Filename too long' in C:\server\root\oss\xsd2php\src\Php\PathGenerator\Psr4PathGenerator.php:19
| @@ -34,7 +34,7 @@ public function __construct(array $targetNs, array $aliases = array(), $tmp = nu | |||
| $this->phpDir = "$tmp/php"; | |||
| $this->jmsDir = "$tmp/jms"; | |||
|
|
|||
| $this->namingStrategy = new ShortNamingStrategy(); | |||
| $this->namingStrategy = defined('PHP_WINDOWS_VERSION_BUILD') ? new VeryShortNamingStrategy() : new ShortNamingStrategy(); | |||
|
@Ocramius, do you mind having a look at this? Is this enough to use zend code 3? |
|
|
||
| "psr/log": "^1.0" | ||
| }, | ||
| "require-dev": { | ||
| "phpunit/phpunit": "^4.8|^5.0", | ||
| "jms/serializer": "^1.3", | ||
| "goetas-webservices/xsd2php-runtime": "^0.2.7" | ||
| "jms/serializer": "^1.9", |
There was a problem hiding this comment.
just as info, are we using some specific jms 1.9 feature?
|
Looks good to me, will test it a bit better and hopefully merge it this week! Thanks again for contributing |
tests/VeryShortNamingStrategy.php
Outdated
| { | ||
| if ($name = $this->classify($type->getName())) { | ||
| if (substr($name, -4) !== 'Type') { | ||
| $name .= "T"; |
There was a problem hiding this comment.
Just return early instead of relying on else/else if
tests/VeryShortNamingStrategy.php
Outdated
| * @param Type $type | ||
| * @return string | ||
| */ | ||
| public function getTypeName(Type $type) |
There was a problem hiding this comment.
@goetas can't we bump to 7.1 and start having type declarations for these?
|
thanks 👍 |
|
@goetas Any chance there will be a new tag with this PR merged soon? |
These changes replace various native PHP type aliases with the formal PHP types since
zend-code ^3.0was considering the aliases as actual classes in parameter hints (egboolean -> \boolean).References to
mixedremoved when used in parameter hints but remain in docblocks.scalarwas replaced withint|stringin doc blocks since its not a valid PHP type or pseudo-type.is_scalar()defines ascalarasint|string|float|boolbut it was used exclusively in an array key context sofloat|boolare converted tointanyways.