#9 - Make compatible with Magento 2.4.0 (#10)

README.md

@@ -6,9 +6,10 @@ This module is intended for Magento 2 developers, in order to reduce the boilerp
 
 ## Compatibility
 
-This module was developed and tested on Magento Open Source 2.3.4 and 2.3.5. I plan to support this for later versions also.
-It may work for versions before 2.3.4, but I didn't test.
-
+ - 2.4.0  
+ - 2.3.5  
+ - 2.3.4  
+ - probably works for versions before 2.3.4, but it's not guaranteed.  
 ## What it does:
 It provides a set of classes and interfaces that can be configured, composed or prerenced in order to avoid writing the same code over and over again.  
 

Test/Unit/Block/Adminhtml/Button/BackTest.php

@@ -41,7 +41,7 @@ class BackTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->url = $this->createMock(UrlInterface::class);
         $this->uiConfig = $this->createMock(EntityUiConfig::class);

Test/Unit/Block/Adminhtml/Button/DeleteTest.php

@@ -57,7 +57,7 @@ class DeleteTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->request = $this->createMock(RequestInterface::class);
         $this->entityUiManager = $this->createMock(EntityUiManagerInterface::class);

Test/Unit/Block/Adminhtml/Button/SaveTest.php

@@ -40,7 +40,7 @@ class SaveTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->uiConfig = $this->createMock(EntityUiConfig::class);
         $this->save = new Save(

Test/Unit/Console/Command/DeployTest.php

@@ -58,7 +58,7 @@ class DeployTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->reader = $this->createMock(Reader::class);
         $this->ioFile = $this->createMock(File::class);

Test/Unit/Controller/DeleteTest.php

@@ -73,7 +73,7 @@ class DeleteTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
         $this->uiConfig = $this->createMock(EntityUiConfig::class);

Test/Unit/Controller/EditTest.php

@@ -36,34 +36,14 @@
 
 class EditTest extends TestCase
 {
-    /**
-     * @var Context | MockObject
-     */
-    private $context;
-    /**
-     * @var EntityUiManagerInterface | MockObject
-     */
-    private $entityUiManager;
     /**
      * @var EntityUiConfig | MockObject
      */
     private $uiConfig;
-    /**
-     * @var RequestInterface | MockObject
-     */
-    private $request;
-    /**
-     * @var Config | MockObject
-     */
-    private $pageConfig;
     /**
      * @var Title | MockObject
      */
     private $pageTitle;
-    /**
-     * @var ResultFactory | MockObject
-     */
-    private $resultFactory;
     /**
      * @var Page | MockObject
      */
@@ -80,26 +60,26 @@ class EditTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->context = $this->createMock(Context::class);
-        $this->entityUiManager = $this->createMock(EntityUiManagerInterface::class);
+        $context = $this->createMock(Context::class);
+        $entityUiManager = $this->createMock(EntityUiManagerInterface::class);
         $this->uiConfig = $this->createMock(EntityUiConfig::class);
-        $this->request = $this->createMock(RequestInterface::class);
+        $request = $this->createMock(RequestInterface::class);
         $this->resultPage = $this->createMock(Page::class);
-        $this->pageConfig = $this->createMock(Config::class);
+        $pageConfig = $this->createMock(Config::class);
         $this->pageTitle = $this->createMock(Title::class);
         $this->entity = $this->createMock(AbstractModel::class);
-        $this->resultFactory = $this->createMock(ResultFactory::class);
-        $this->context->method('getRequest')->willReturn($this->request);
-        $this->context->method('getResultFactory')->willReturn($this->resultFactory);
-        $this->pageConfig->method('getTitle')->willReturn($this->pageTitle);
-        $this->resultFactory->method('create')->willReturn($this->resultPage);
-        $this->resultPage->method('getConfig')->willReturn($this->pageConfig);
-        $this->entityUiManager->method('get')->willReturn($this->entity);
+        $resultFactory = $this->createMock(ResultFactory::class);
+        $context->method('getRequest')->willReturn($request);
+        $context->method('getResultFactory')->willReturn($resultFactory);
+        $pageConfig->method('getTitle')->willReturn($this->pageTitle);
+        $resultFactory->method('create')->willReturn($this->resultPage);
+        $this->resultPage->method('getConfig')->willReturn($pageConfig);
+        $entityUiManager->method('get')->willReturn($this->entity);
         $this->edit = new Edit(
-            $this->context,
-            $this->entityUiManager,
+            $context,
+            $entityUiManager,
             $this->uiConfig
         );
     }
@@ -114,8 +94,8 @@ public function testExecuteEdit()
         $this->uiConfig->expects($this->once())->method('getListPageTitle')->willReturn('PageTitle');
         $this->resultPage->expects($this->once())->method('setActiveMenu')->with('SelectedMenu');
         $this->pageTitle->expects($this->exactly(2))->method('prepend')->withConsecutive(
-            $this->equalTo('PageTitle'),
-            $this->equalTo('name')
+            [$this->equalTo('PageTitle')],
+            [$this->equalTo('name')]
         );
         $this->entity->method('getId')->willReturn(1);
         $this->entity->method('getData')->willReturn('name');
@@ -134,8 +114,8 @@ public function testExecuteMew()
         $this->resultPage->expects($this->once())->method('setActiveMenu')->with('SelectedMenu');
         $this->uiConfig->expects($this->once())->method('getNewLabel')->willReturn('new');
         $this->pageTitle->expects($this->exactly(2))->method('prepend')->withConsecutive(
-            $this->equalTo('PageTitle'),
-            $this->equalTo('new')
+            [$this->equalTo('PageTitle')],
+            [$this->equalTo('new')]
         );
         $this->entity->method('getId')->willReturn(null);
         $this->entity->expects($this->never())->method('getData');

Test/Unit/Controller/IndexTest.php

@@ -65,7 +65,7 @@ class IndexTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
         $this->uiConfig = $this->createMock(EntityUiConfig::class);

Test/Unit/Controller/InlineEditTest.php

@@ -67,7 +67,7 @@ class InlineEditTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
         $this->dataProcessor = $this->createMock(SaveDataProcessorInterface::class);

Test/Unit/Controller/MassDeleteTest.php

@@ -89,7 +89,7 @@ class MassDeleteTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->om = new ObjectManager($this);
         $this->context = $this->createMock(Context::class);

Test/Unit/Controller/SaveTest.php

@@ -91,7 +91,7 @@ class SaveTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
         $this->dataObjectHelper = $this->createMock(DataObjectHelper::class);

Test/Unit/Controller/UploadTest.php

@@ -60,7 +60,7 @@ class UploadTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
         $this->uploader = $this->createMock(Uploader::class);

Test/Unit/Generator/ListRepoTest.php

@@ -62,7 +62,7 @@ class ListRepoTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->nameMatcher = $this->createMock(NameMatcher::class);
         $this->ioObject = $this->createMock(Io::class);

Test/Unit/Generator/NameMatcherTest.php

@@ -34,7 +34,7 @@ class NameMatcherTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->nameMatcher = new NameMatcher();
     }

Test/Unit/Generator/RepoTest.php

@@ -61,7 +61,7 @@ class RepoTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->nameMatcher = $this->createMock(NameMatcher::class);
         $this->ioObject = $this->createMock(Io::class);

Test/Unit/Generator/UiCollectionProviderTest.php

@@ -61,7 +61,7 @@ class UiCollectionProviderTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->nameMatcher = $this->createMock(NameMatcher::class);
         $this->ioObject = $this->createMock(Io::class);

Test/Unit/Generator/UiManagerTest.php

@@ -61,7 +61,7 @@ class UiManagerTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->nameMatcher = $this->createMock(NameMatcher::class);
         $this->ioObject = $this->createMock(Io::class);

Test/Unit/Model/FileCheckerTest.php

@@ -40,7 +40,7 @@ class FileCheckerTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->file = $this->createMock(File::class);
         $this->fileChecker = new FileChecker(

Test/Unit/Model/FileInfoTest.php

@@ -63,7 +63,7 @@ class FileInfoTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->filesystem = $this->createMock(Filesystem::class);
         $this->mime = $this->createMock(Mime::class);

Test/Unit/Model/ResourceModel/AbstractModelTest.php

@@ -64,7 +64,7 @@ class AbstractModelTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
         $this->entityManager = $this->createMock(EntityManager::class);

Test/Unit/Model/ResourceModel/Collection/AbstractCollectionTest.php

@@ -91,7 +91,7 @@ class AbstractCollectionTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->entityFactory = $this->createMock(EntityFactoryInterface::class);
         $this->logger = $this->createMock(LoggerInterface::class);

Test/Unit/Model/ResourceModel/Collection/StoreAwareAbstractCollectionTest.php

@@ -105,7 +105,7 @@ class StoreAwareAbstractCollectionTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->entityFactory = $this->createMock(EntityFactoryInterface::class);
         $this->logger = $this->createMock(LoggerInterface::class);

Test/Unit/Model/ResourceModel/Relation/Store/ReadHandlerTest.php

@@ -41,7 +41,7 @@ class ReadHandlerTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->resource = $this->createMock(StoreAwareAbstractModel::class);
         $this->readHandler = new ReadHandler($this->resource);

Test/Unit/Model/ResourceModel/Relation/Store/SaveHandlerTest.php

@@ -60,7 +60,7 @@ class SaveHandlerTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->metadataPool = $this->createMock(MetadataPool::class);
         $this->resource = $this->createMock(StoreAwareAbstractModel::class);

Test/Unit/Model/ResourceModel/StoreAwareAbstractModelTest.php

@@ -80,7 +80,7 @@ class StoreAwareAbstractModelTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->context = $this->createMock(Context::class);
         $this->entityManager = $this->createMock(EntityManager::class);

Test/Unit/Model/ResourceModel/StoreTest.php

@@ -52,7 +52,7 @@ class StoreTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $om = new ObjectManager($this);
         $this->collection = $om->getCollectionMock(

Test/Unit/Model/UploaderTest.php

@@ -75,7 +75,7 @@ class UploaderTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->coreFileStorageDatabase = $this->createMock(Database::class);
         $this->filesystem = $this->createMock(Filesystem::class);

Test/Unit/Source/Catalog/ProductAttributeOptionsTest.php

@@ -47,7 +47,7 @@ class ProductAttributeOptionsTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->attributeRepository = $this->createMock(ProductAttributeRepositoryInterface::class);
         $this->attribute = $this->createMock(ProductAttributeInterface::class);

Test/Unit/Source/Catalog/ProductAttributeSetTest.php

@@ -66,7 +66,7 @@ class ProductAttributeSetTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->attributeSetRepository = $this->createMock(AttributeSetRepositoryInterface::class);
         $this->searchCriteriaBuilder = $this->createMock(SearchCriteriaBuilder::class);

Test/Unit/Source/Catalog/ProductAttributeTest.php

@@ -66,7 +66,7 @@ class ProductAttributeTest extends TestCase
     /**
      * setup tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->attributeRepository = $this->createMock(ProductAttributeRepositoryInterface::class);
         $this->searchCriteriaBuilder = $this->createMock(SearchCriteriaBuilder::class);