Merge pull request #1591 from magento-engcom/develop-prs

Public Pull Requests #11360 #11206
magento · Oct 16, 2017 · ad44399 · ad44399
2 parents 0f1c2f1 + f59cfe2
commit ad44399
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/code/Magento/Cron/etc/di.xml b/app/code/Magento/Cron/etc/di.xml
@@ -43,7 +43,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Crontab\CrontabManager">
+    <type name="Magento\Framework\Crontab\CrontabManagerInterface">
         <arguments>
             <argument name="shell" xsi:type="object">Magento\Framework\App\Shell</argument>
         </arguments>

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -206,10 +206,12 @@ public function testCodeStyle()
 
         $reportFile = self::$reportDir . '/phpcs_report.txt';
         $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
+        $result = $codeSniffer->run($whiteList);
+        $report = file_exists($reportFile) ? file_get_contents($reportFile) : '';
         $this->assertEquals(
             0,
-            $result = $codeSniffer->run($whiteList),
-            "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . file_get_contents($reportFile)
+            $result,
+            "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . $report
         );
     }