Merge pull request #10 from integer-net/travis-update

Update travis and latest magento 2.4-dev support

Author: wigman

.travis.yml

@@ -1,6 +1,8 @@
 os: linux
 dist: trusty
 group: edge
+services:
+  - elasticsearch
 addons:
   apt:
     packages:
@@ -25,10 +27,6 @@ jobs:
       env:
         - MAGENTO_VERSION=2.3
         - TEST_SUITE=integration
-    - php: 7.2
-      env:
-        - MAGENTO_VERSION=2.4-develop
-        - TEST_SUITE=integration
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin
@@ -37,9 +35,12 @@ cache:
   apt: true
   directories:
     - $HOME/.composer/cache
-before_script: ./.travis/before_script.sh
+before_script:
+  - |
+    sleep 10
+    ./.travis/before_script.sh
 script: phpunit -c magento2/dev/tests/$TEST_SUITE --coverage-text --coverage-clover=/tmp/coverage.clover
 after_script:
   - |
     wget https://scrutinizer-ci.com/ocular.phar
-    php ocular.phar code-coverage:upload --format=php-clover /tmp/coverage.clover
+    php ocular.phar code-coverage:upload --format=php-clover /tmp/coverage.clover

CHANGELOG.md

@@ -18,3 +18,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Adds module registration test (registration.php coverage)
 - Adds travis config for tags/releases
+
+## 1.1.2 - 2020-05-11
+### Added
+- Updates travis, magento 2.4-dev now requires elasticsearch
+- Adds return type declaration (`void`) to `setUp()` functions, now needed for magento 2.4

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "integer-net/magento2-global-custom-layout",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "description": "Module for Magento 2 that allows you to add global layout update files to be selected from admin, by using '0' instead of an entity_id",
     "authors": [
         {

tests/Integration/AbstractFrontendControllerTest.php

@@ -38,7 +38,7 @@ abstract class AbstractFrontendControllerTest extends AbstractController
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->layoutInterface = $this->objectManager->get(LayoutInterface::class);

tests/Integration/CategoryFrontendControllerTest.php

@@ -27,7 +27,7 @@ class CategoryFrontendControllerTest extends AbstractFrontendControllerTest
     /** @var CategoryInterface $category */
     protected $category;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Integration/PageFrontendControllerTest.php

@@ -29,7 +29,7 @@ class PageFrontendControllerTest extends AbstractFrontendControllerTest
     /** @var CustomLayoutRepositoryInterface $repository */
     protected $repository;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Integration/ProductFrontendControllerTest.php

@@ -25,7 +25,7 @@ class ProductFrontendControllerTest extends AbstractFrontendControllerTest
     /** @var ProductLayoutUpdateManager $layoutManager */
     protected $layoutManager;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();