Skip to content

Commit cea7eee

Browse files
committed
Build and PHPMD fixes
1 parent 99dc87c commit cea7eee

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
composer.lock
2-
marketplace-eqp/
3-
Test/Unit/logs/
4-
vendor/
1+
/composer.lock
2+
/magento-coding-standard/
3+
/Test/Unit/logs/
4+
/vendor/

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ language: php
55
php:
66
- 7.1
77
- 7.2
8+
- 7.3
89

910
install:
1011
- mkdir -p ~/.composer/
1112
- echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > ~/.composer/auth.json
1213
- composer install --prefer-dist
13-
- composer create-project --repository=https://repo.magento.com magento/marketplace-eqp marketplace-eqp
14+
- composer create-project magento/magento-coding-standard magento-coding-standard
1415

1516
script:
16-
- php marketplace-eqp/vendor/bin/phpcs Model/ Test/ --standard=MEQP2 --severity=10
17+
- php magento-coding-standard/vendor/bin/phpcs Model/ Test/ --standard=Magento2 --severity=10
1718
- php vendor/bin/phpmd Model/,Test text cleancode,codesize,controversial,design,naming,unusedcode --ignore-violations-on-exit
1819
- php vendor/phpunit/phpunit/phpunit --coverage-clover Test/Unit/logs/clover.xml Test
1920

Model/CatalogUrlRewrite/ProductUrlRewriteGenerator.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Magento\Store\Model\StoreManagerInterface;
1818

1919
/**
20+
* @SuppressWarnings(PHPMD.LongVariable)
2021
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2122
*/
2223
class ProductUrlRewriteGenerator extends \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
@@ -30,8 +31,6 @@ class ProductUrlRewriteGenerator extends \Magento\CatalogUrlRewrite\Model\Produc
3031
* Generates url rewrites for different scopes.
3132
*
3233
* @var ProductScopeRewriteGenerator
33-
*
34-
* @SuppressWarnings(PHPMD.LongVariable)
3534
*/
3635
private $productScopeRewriteGenerator;
3736

@@ -44,7 +43,6 @@ class ProductUrlRewriteGenerator extends \Magento\CatalogUrlRewrite\Model\Produc
4443
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
4544
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
4645
*
47-
* @SuppressWarnings(PHPMD.LongVariable)
4846
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
4947
*/
5048
public function __construct(

Test/Unit/Model/CatalogUrlRewrite/ProductUrlRewriteGeneratorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Aune\ProductCategoryUrlFix\Test\Unit\Model\CatalogUrlRewrite;
44

5+
use ReflectionClass;
56
use Magento\Framework\App\Config\ScopeConfigInterface;
67
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
78
use Magento\Catalog\Model\Product;
@@ -110,7 +111,7 @@ protected function setUp()
110111
);
111112

112113
// Inject private property to avoid ObjectManager error
113-
$reflection = new \ReflectionClass(get_class($this->productUrlRewriteGenerator));
114+
$reflection = new ReflectionClass(get_class($this->productUrlRewriteGenerator));
114115
$reflectionProperty = $reflection->getProperty('productScopeRewriteGenerator');
115116
$reflectionProperty->setAccessible(true);
116117
$reflectionProperty->setValue($this->productUrlRewriteGenerator, $this->productScopeRewriteGenerator);

Test/Unit/bootstrap.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<?php
22

3-
// @codingStandardsIgnoreFile
3+
/**
4+
* @codingStandardsIgnoreFile
5+
* @SuppressWarnings(PHPMD)
6+
*/
47

58
require_once realpath(__DIR__ . '/../../vendor/autoload.php');
69

710
if (!function_exists('__')) {
811
/**
912
* Create value-object \Magento\Framework\Phrase
1013
*
11-
* @SuppressWarnings(PHPMD.ShortMethodName)
1214
* @return \Magento\Framework\Phrase
1315
*/
1416
function __()

0 commit comments

Comments
 (0)