MAGETWO-31059: Integration tests with fatals, code under test and framework adaptation

- necessary changes after sync with mainline, cleanup

Author: orlangur

.htaccess

@@ -170,10 +170,6 @@
 
 </IfModule>
 
-<IfModule mod_env.c>
-    SetEnv MAGE_MODE "developer"
-</IfModule>
-
 ############################################
 ## By default allow all access
 

app/code/Magento/Bundle/Test/Unit/Model/Product/Attribute/Source/Price/ViewTest.php

@@ -74,7 +74,7 @@ public function testGetOptionTextForExistLabel()
     {
         $existValue = 1;
 
-        $this->assertInternalType('string', $this->model->getOptionText($existValue));
+        $this->assertInstanceOf('Magento\Framework\Phrase', $this->model->getOptionText($existValue));
     }
 
     /**

app/code/Magento/Cms/Test/Unit/Block/Adminhtml/Block/EditTest.php

@@ -53,7 +53,7 @@ protected function setUp()
             'Magento\Cms\Block\Adminhtml\Block\Edit',
             [
                 'registry' => $this->registryMock,
-                'escaper' => $this->escaperMock
+                'escaper' => $this->escaperMock,
             ]
         );
     }
@@ -84,14 +84,14 @@ public function testGetHeaderText($modelBlockId)
             ->with($title)
             ->willReturn($escapedTitle);
 
-        $this->assertInternalType('string', $this->this->getHeaderText());
+        $this->assertInstanceOf('Magento\Framework\Phrase', $this->this->getHeaderText());
     }
 
     public function getHeaderTextDataProvider()
     {
         return [
             'modelBlockId NOT EMPTY' => ['modelBlockId' => 1],
-            'modelBlockId IS EMPTY' => ['modelBlockId' => null]
+            'modelBlockId IS EMPTY' => ['modelBlockId' => null],
         ];
     }
 }

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -779,7 +779,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
                     }
 
                     if (!isset($_result[0])) {
-                        return __('Cannot add the item to shopping cart');
+                        return __('Cannot add the item to shopping cart')->render();
                     }
 
                     /**

app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php

@@ -171,7 +171,7 @@ protected function setUp()
                 'customerRepository' => $this->customerRepositoryMock,
                 'addressHelper' => $this->addressHelperMock,
                 'urlFactory' => $urlFactoryMock,
-                'resultRedirectFactory' => $redirectFactoryMock
+                'resultRedirectFactory' => $redirectFactoryMock,
             ]
         );
     }
@@ -388,12 +388,12 @@ public function testSuccessRedirect(
             ->with($this->equalTo('*/*/index'), ['_secure' => true])
             ->will($this->returnValue($successUrl));
 
-        $this->redirectMock->expects($this->once())
+        $this->redirectMock->expects($this->never())
             ->method('success')
             ->with($this->equalTo($resultUrl))
             ->will($this->returnValue($resultUrl));
 
-        $this->scopeConfigMock->expects($this->once())
+        $this->scopeConfigMock->expects($this->never())
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD),
@@ -426,7 +426,7 @@ public function getSuccessRedirectDataProvider()
                 'http://example.com/success',
                 'http://example.com/success',
                 true,
-                __('Thank you for registering with')
+                __('Thank you for registering with'),
             ],
             [
                 1,
@@ -435,7 +435,7 @@ public function getSuccessRedirectDataProvider()
                 'http://example.com/success',
                 'http://example.com/success',
                 false,
-                __('Thank you for registering with')
+                __('Thank you for registering with'),
             ],
         ];
     }

app/code/Magento/Downloadable/Model/Product/Type.php

@@ -482,7 +482,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
             return $result;
         }
         if ($this->getLinkSelectionRequired($product) && $this->_isStrictProcessMode($processMode)) {
-            return __('Please specify product link(s).');
+            return __('Please specify product link(s).')->render();
         }
         return $result;
     }

app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php

@@ -262,7 +262,7 @@ public function getStatusFilters($product)
         if (!$product->hasData($this->_keyStatusFilters)) {
             return [
                 \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
-                \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED
+                \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED,
             ];
         }
         return $product->getData($this->_keyStatusFilters);
@@ -361,7 +361,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
                             }
 
                             if (!isset($_result[0])) {
-                                return __('We cannot process the item.');
+                                return __('We cannot process the item.')->render();
                             }
 
                             if ($isStrictProcessMode) {
@@ -399,7 +399,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
             }
         }
 
-        return __('Please specify the quantity of product(s).');
+        return __('Please specify the quantity of product(s).')->render();
     }
 
     /**

app/functions.php

@@ -18,5 +18,5 @@ function __()
         $argc = $argc[0];
     }
 
-    return (new \Magento\Framework\Phrase($text, $argc))->render();
+    return new \Magento\Framework\Phrase($text, $argc);
 }

dev/tests/static/testsuite/Magento/Test/HhvmCompatibility/IniGetSetTest.php renamed to dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php

@@ -6,11 +6,11 @@
  * See COPYING.txt for license details.
  *
  */
-namespace Magento\Test\HhvmCompatibility;
+namespace Magento\Test\Integrity;
 
-use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\App\Utility\Files;
 
-class IniGetSetTest extends \PHPUnit_Framework_TestCase
+class HhvmCompatibilityTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var array
@@ -38,7 +38,7 @@ class IniGetSetTest extends \PHPUnit_Framework_TestCase
         'default_socket_timeout',
     ];
 
-    public function testAllowedGetSetDirectives()
+    public function testAllowedIniGetSetDirectives()
     {
         $deniedDirectives = [];
         foreach ($this->getFiles() as $file) {

dev/tools/Magento/Tools/View/deploy.php

@@ -43,7 +43,7 @@
 
 try {
     // run the deployment logic
-    $filesUtil = new \Magento\Framework\Test\Utility\Files(BP);
+    $filesUtil = new \Magento\Framework\App\Utility\Files(BP);
     $omFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, []);
     $objectManager = $omFactory->create(
         [\Magento\Framework\App\State::PARAM_MODE => \Magento\Framework\App\State::MODE_DEFAULT]

lib/internal/Magento/Framework/Test/Unit/PhraseTest.php

@@ -92,9 +92,4 @@ protected function removeRendererFromPhrase()
         $property->setAccessible(true);
         $property->setValue($this->phrase, null);
     }
-
-    public function testGlobalFunction()
-    {
-        $this->assertFalse(is_object(__('Test')));
-    }
 }