Merge remote-tracking branch 'origin/develop' into MAGETWO-49390-2

Author: adifucan

.travis.yml

@@ -11,8 +11,7 @@ env:
   - TEST_SUITE=integration_part_1
   - TEST_SUITE=integration_part_2
   - TEST_SUITE=integration_integrity
-  - TEST_SUITE=static_phpcs
-  - TEST_SUITE=static_annotation
+  - TEST_SUITE=static
 cache:
   apt: true
   directories:
@@ -21,9 +20,9 @@ cache:
 matrix:
   exclude:
     - php: 5.6
-      env: TEST_SUITE=static_phpcs
-    - php: 5.6
-      env: TEST_SUITE=static_annotation
+      env: TEST_SUITE=static
+    - php: 7.0
+      env: TEST_SUITE=static
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq postfix
@@ -68,6 +67,4 @@ script:
   # Integration integrity tests
   - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
   # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
-  # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'static' ]; then cd dev/tests/static/; php get_github_changes.php --output-file='$TRAVIS_BUILD_DIR/dev/tests/static/testsuite/Magento/Test/_files/changed_files_ce.txt' --base-path='$TRAVIS_BUILD_DIR' --repo='https://github.com/magento/magento2.git' --branch='develop'; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest'; fi"

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=master)](https://travis-ci.org/magento/magento2)
+[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php

@@ -33,8 +33,7 @@ class TierPriceTest extends \PHPUnit_Framework_TestCase
      */
     protected $tierPrice;
 
-
-    public function setUp()
+    protected function setUp()
     {
         $this->groupRepository = $this->getMockBuilder('\Magento\Customer\Api\GroupRepositoryInterface')
             ->disableOriginalConstructor()

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

@@ -25,7 +25,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
      */
     protected $website;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webSiteModel = $this->getMock(
             '\Magento\Store\Model\WebSite',

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php

@@ -25,7 +25,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
      */
     protected $validatorTest;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->validatorTest = $this->getMockForAbstractClass(
             'Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface',

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -123,7 +123,7 @@ class AdvancedPricingTest extends \Magento\ImportExport\Test\Unit\Model\Import\A
      */
     protected $errorAggregator;
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Indexer/Product/Price/Plugin/ImportTest.php

@@ -25,7 +25,7 @@ class ImportTest extends \PHPUnit_Framework_TestCase
      */
     protected $advancedPricing;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->indexer = $this->getMockForAbstractClass('\Magento\Framework\Indexer\IndexerInterface', [], '', false);
         $this->import = $this->getMock(

app/code/Magento/Authorizenet/Test/Unit/Controller/Directpost/Payment/PlaceTest.php

@@ -33,6 +33,7 @@ class PlaceTest extends \PHPUnit_Framework_TestCase
      * @var ObjectManager
      */
     protected $objectManager;
+
     /**
      * @var Place
      */
@@ -98,7 +99,7 @@ class PlaceTest extends \PHPUnit_Framework_TestCase
      */
     protected $checkoutSessionMock;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->directpostSessionMock = $this
             ->getMockBuilder('Magento\Authorizenet\Model\Directpost\Session')

app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/SessionTest.php

@@ -26,7 +26,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
      */
     protected $storageMock;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->storageMock = $this
             ->getMockBuilder('Magento\Framework\Session\StorageInterface')

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php

@@ -47,6 +47,7 @@ public function __construct(
      * Retrieve date format
      *
      * @return string
+     * @deprecated
      */
     protected function _getFormat()
     {
@@ -74,16 +75,18 @@ protected function _getFormat()
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        if ($data = $row->getData($this->getColumn()->getIndex())) {
-            $timezone = $this->getColumn()->getTimezone() !== false ? $this->_localeDate->getConfigTimezone() : 'UTC';
-            return $this->dateTimeFormatter->formatObject(
-                $this->_localeDate->date(
-                    new \DateTime(
-                        $data,
-                        new \DateTimeZone($timezone)
-                    )
-                ),
-                $this->_getFormat()
+        $format = $this->getColumn()->getFormat();
+        $date = $this->_getValue($row);
+        if ($date) {
+            if (!($date instanceof \DateTimeInterface)) {
+                $date = new \DateTime($date);
+            }
+            return $this->_localeDate->formatDateTime(
+                $date,
+                $format ?: \IntlDateFormatter::MEDIUM,
+                \IntlDateFormatter::NONE,
+                null,
+                $this->getColumn()->getTimezone() === false ? 'UTC' : null
             );
         }
         return $this->getColumn()->getDefault();