Skip to content

MAGECLOUD-5359: Patches 1.0.2 fail on magento version 2.1.4 with php 7.0 #22

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

Merged
merged 3 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Model/UrlFinder/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Product implements CloudUrlFinderInterface
/**
* Product limit per store
*/
public const PRODUCT_LIMIT = 100;
const PRODUCT_LIMIT = 100;

/**
* @var UrlFixer
Expand Down
6 changes: 3 additions & 3 deletions Test/Unit/Model/UrlFinderFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected function setUp()
$this->urlFinderFactory = new UrlFinderFactory($this->objectManagerMock);
}

public function testCreateCategoryOrCmsPageEntity(): void
public function testCreateCategoryOrCmsPageEntity()
{
$this->objectManagerMock->expects($this->once())
->method('create')
Expand All @@ -56,7 +56,7 @@ public function testCreateCategoryOrCmsPageEntity(): void
]);
}

public function testCreateProductEntity(): void
public function testCreateProductEntity()
{
$this->objectManagerMock->expects($this->once())
->method('create')
Expand All @@ -74,7 +74,7 @@ public function testCreateProductEntity(): void
]);
}

public function testCreateWrongType(): void
public function testCreateWrongType()
{
$this->expectException(UnexpectedValueException::class);
$this->expectExceptionMessage('Wrong entity type.');
Expand Down
2 changes: 1 addition & 1 deletion Test/static/Sniffs/Directives/StrictTypesSniff.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function process(File $phpcsFile, $stackPtr)
* @param File $phpcsFile
* @param int $position
*/
private function fix(File $phpcsFile, int $position) : void
private function fix(File $phpcsFile, int $position)
{
// Get the fixer.
$fixer = $phpcsFile->fixer;
Expand Down
11 changes: 0 additions & 11 deletions Test/static/phpstan.neon

This file was deleted.

2 changes: 0 additions & 2 deletions Test/static/static-travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ function log() {
printf "\nRunning %s tests:\n" "$1"
}

log "phpstan"
./vendor/bin/phpstan analyse -c Test/static/phpstan.neon
log "phpcs"
./vendor/bin/phpcs ./ --standard=Test/static/phpcs-ruleset.xml -p -n
log "phpmd"
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/magento-cloud-components",
"description": "Cloud Components Module for Magento 2.x",
"type": "magento2-module",
"version": "1.0.2",
"version": "1.0.3",
"require": {
"php": "^7.0",
"ext-json": "*"
Expand All @@ -14,18 +14,15 @@
},
"require-dev": {
"phpmd/phpmd": "@stable",
"phpstan/phpstan": "^0.11",
"phpunit/phpunit": "^6.2",
"squizlabs/php_codesniffer": "^3.0"
},
"scripts": {
"test": [
"@phpstan",
"@phpcs",
"@phpmd",
"@phpunit"
],
"phpstan": "phpstan analyse -c Test/static/phpstan.neon",
"phpcs": "phpcs ./ --standard=Test/static/phpcs-ruleset.xml -p -n",
"phpmd": "phpmd Console xml Test/static/phpmd-ruleset.xml",
"phpunit": "phpunit --configuration Test/Unit",
Expand Down