Merge remote-tracking branch 'mainline/2.1' into MAGETWO-63201

Sergii Kovalenko · Sergii Kovalenko · commit 5a8da9758a0f · 2017-02-09T12:07:36.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -20,7 +20,6 @@ env:
     - TEST_SUITE=integration INTEGRATION_INDEX=1
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
-    - TEST_SUITE=static
 cache:
   apt: true
   directories: $HOME/.composer/cache
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/CopyrightTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/CopyrightTest.php
@@ -17,7 +17,7 @@ public function testCopyright()
         $invoker(
             function ($filename) {
                 $fileText = file_get_contents($filename);
-                if (strpos($fileText, 'Copyright © ' . date('Y')) === false) {
+                if (strpos($fileText, 'Copyright © 2013-' . date('Y')) === false) {
                     $this->fail('Copyright is missing or has wrong year in ' . $filename);
                 }
             },

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function testCopyright()`
`17`	`17`	`$invoker(`
`18`	`18`	`function ($filename) {`
`19`	`19`	`$fileText = file_get_contents($filename);`
`20`		`- if (strpos($fileText, 'Copyright © ' . date('Y')) === false) {`
	`20`	`+ if (strpos($fileText, 'Copyright © 2013-' . date('Y')) === false) {`
`21`	`21`	`$this->fail('Copyright is missing or has wrong year in ' . $filename);`
`22`	`22`	`}`
`23`	`23`	`},`