Skip to content

Commit c6e63ab

Browse files
author
Robert He
committed
MAGETWO-69137: upgrading Magento2 Project PHPUnit version to latest
- changed unit tests to support PHPUnit 6.2
1 parent 3e4379a commit c6e63ab

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ script:
5959
- test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
6060

6161
# The scripts for grunt/phpunit type tests
62-
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit --debug --verbose -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
63-
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit --debug --verbose -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
62+
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
63+
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6464
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi

lib/internal/Magento/Framework/EntityManager/EntityManager.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*
2323
* For filtering operations, it's recommended to use successor of
2424
* Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection class.
25-
*
26-
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2725
*/
2826
class EntityManager
2927
{

0 commit comments

Comments
 (0)