Merge pull request #70 from blitze/github-actions

Migrate fully to github actions

Author: blitze

.gitattributes

@@ -2,12 +2,12 @@
 
 docs/				export-ignore
 tests/				export-ignore
-travis/				export-ignore
+.github/ 			export-ignore
+.babelrc			export-ignore
 .eslintrc			export-ignore
 .gitattributes		export-ignore
 .gitignore			export-ignore
 .prettierrc			export-ignore
-.travis.yml			export-ignore
 build.xml   		export-ignore
 crowdin.yaml		export-ignore
 composer.lock		export-ignore

.github/codecov.yml

@@ -0,0 +1,4 @@
+fixes:
+   - "phpBB3/phpBB/ext/blitze/sitemaker::"
+ignore:
+  - "node_modules/"

.github/workflows/tests.yml

@@ -83,6 +83,11 @@ jobs:
         run: .github/ext-check-executable-files.sh ./ $EXTNAME
         working-directory: ./phpBB3
 
+      - name: Prep for EPV # the below directories may have a composer.json file which causes EPV to fail
+        working-directory: phpBB3/phpBB/ext/${{ env.EXTNAME }}
+        run: |
+          rm -rf docs tests
+
       - name: Run EPV
         if: ${{ env.EPV != 0 }}
         run: phpBB/vendor/bin/EPV.php run --dir="phpBB/ext/$EXTNAME/"
@@ -125,8 +130,8 @@ jobs:
             db: "mysql:8.0"
           - php: "8.0"
             db: "mysql:5.7"
-          - php: "8.1"
-            db: "mysql:5.7"
+          # - php: "8.1"
+          #   db: "mysql:5.7"
 
     name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
@@ -195,7 +200,6 @@ jobs:
         working-directory: phpBB3/phpBB
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-          composer self-update --1
 
       - name: Cache composer dependencies
         uses: actions/cache@v2
@@ -355,7 +359,6 @@ jobs:
         working-directory: phpBB3/phpBB
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-          composer self-update --1
 
       - name: Cache composer dependencies
         uses: actions/cache@v2
@@ -422,39 +425,39 @@ jobs:
         include:
           - php: "7.1"
             db: "sqlite3"
-          - php: "7.2"
-            db: "mcr.microsoft.com/mssql/server:2017-latest"
-            db_alias: "MSSQL 2017"
-          - php: "7.2"
-            db: "mcr.microsoft.com/mssql/server:2019-latest"
-            db_alias: "MSSQL 2019"
+          # - php: "7.2"
+          #   db: "mcr.microsoft.com/mssql/server:2017-latest"
+          #   db_alias: "MSSQL 2017"
+          # - php: "7.2"
+          #   db: "mcr.microsoft.com/mssql/server:2019-latest"
+          #   db_alias: "MSSQL 2019"
 
     name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
-    services:
-      mssql:
-        image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
-        env:
-          SA_PASSWORD: "Pssw0rd_12"
-          ACCEPT_EULA: "y"
-        ports:
-          - 1433:1433
-        options: >-
-          --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pssw0rd_12' -Q \"Use [master]; CREATE DATABASE [phpbb_tests] COLLATE Latin1_General_CI_AS\" || exit 1"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-          --health-start-period 10s
-
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379
+    # services:
+      # mssql:
+      #   image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
+      #   env:
+      #     SA_PASSWORD: "Pssw0rd_12"
+      #     ACCEPT_EULA: "y"
+      #   ports:
+      #     - 1433:1433
+      #   options: >-
+      #     --health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pssw0rd_12' -Q \"Use [master]; CREATE DATABASE [phpbb_tests] COLLATE Latin1_General_CI_AS\" || exit 1"
+      #     --health-interval 10s
+      #     --health-timeout 5s
+      #     --health-retries 5
+      #     --health-start-period 10s
+
+      # redis:
+      #   image: redis
+      #   options: >-
+      #     --health-cmd "redis-cli ping"
+      #     --health-interval 10s
+      #     --health-timeout 5s
+      #     --health-retries 5
+      #   ports:
+      #     - 6379:6379
 
     steps:
       - name: Checkout phpBB
@@ -493,7 +496,6 @@ jobs:
         working-directory: phpBB3/phpBB
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-          composer self-update --1
 
       - name: Cache composer dependencies
         uses: actions/cache@v2

.travis.yml

@@ -1,59 +1,55 @@
 # phpBB SiteMaker Extension
 
-phpBB SiteMaker is an Extension for [phpBB 3.2](https://www.phpbb.com/)
+phpBB SiteMaker is an Extension for [phpBB](https://www.phpbb.com/)
 
 ## Description
 
 phpBB SiteMaker allows you to transform your phpBB3 board into a full-blown site.
 
-[![Travis branch](https://img.shields.io/travis/blitze/phpBB-ext-sitemaker/develop.svg?style=flat)](https://travis-ci.org/blitze/phpBB-ext-sitemaker)
+[![Build Status](https://github.com/blitze/phpBB-ext-sitemaker/workflows/Tests/badge.svg)](https://github.com/blitze/phpBB-ext-sitemaker/actions)
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/blitze/phpBB-ext-sitemaker/develop.svg?style=flat)](https://scrutinizer-ci.com/g/blitze/phpBB-ext-sitemaker/?branch=develop)
-[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/blitze/phpBB-ext-sitemaker/develop.svg?style=flat)](https://scrutinizer-ci.com/g/blitze/phpBB-ext-sitemaker/?branch=develop)
+[![Code Coverage](https://img.shields.io/codecov/c/github/blitze/phpBB-ext-sitemaker/develop?style=flat-square&token=SWzwp4FuiH)](https://codecov.io/gh/blitze/phpBB-ext-sitemaker)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/phpbb-ext-sitemaker/localized.svg)](https://crowdin.com/project/phpbb-ext-sitemaker)
 [![Maintainability](https://api.codeclimate.com/v1/badges/a9a8d4b2441ad10c9aad/maintainability)](https://codeclimate.com/github/blitze/phpBB-ext-sitemaker_content/maintainability)
 [![Latest Stable Version](https://poser.pugx.org/blitze/sitemaker/v/stable?format=flat)](https://www.phpbb.com/customise/db/extension/phpbb_sitemaker_2/)
 [![License](https://poser.pugx.org/blitze/sitemaker/license?format=flat)](https://packagist.org/packages/blitze/sitemaker)
 
 ## Features
 
-* Customize your site using blocks of content
-* Drag and drop interface for adding/removing blocks
-* Customizable block display - background color, title, etc
-* Set any front-facing controller as your site's landing page
-* Create layouts for each page or set a default layout for your entire site
-* Icon picker for choosing blocks/menu icons using font awesome
-* Limit access to specific blocks based on group memberships
-* Create Menus with nested lists
-* Create blocks with your own content using html/bbcode
+-   Customize your site using blocks of content
+-   Drag and drop interface for adding/removing blocks
+-   Customizable block display - background color, title, etc
+-   Set any front-facing controller as your site's landing page
+-   Create layouts for each page or set a default layout for your entire site
+-   Icon picker for choosing blocks/menu icons using font awesome
+-   Limit access to specific blocks based on group memberships
+-   Create Menus with nested lists
+-   Create blocks with your own content using html/bbcode
 
 ## Documentation
 
-* [Changelog](CHANGELOG.md)
-* [User guide](https://blitze.github.io/phpBB-ext-sitemaker/docs/en/introduction)
-* [Developing Guide](https://blitze.github.io/phpBB-ext-sitemaker/docs/en/developer-extensions)
-* [Contributing](https://blitze.github.io/phpBB-ext-sitemaker/docs/en/contrib-overview)
+-   [Changelog](CHANGELOG.md)
+-   [User guide](https://blitze.github.io/phpBB-ext-sitemaker/docs/en/introduction)
+-   [Developing Guide](https://blitze.github.io/phpBB-ext-sitemaker/docs/en/developer-extensions)
+-   [Contributing](https://blitze.github.io/phpBB-ext-sitemaker/docs/en/contrib-overview)
 
 ## Download & Installation
 
-* Download the extension from [here](https://www.phpbb.com/customise/db/extension/phpbb_sitemaker_2/)
-* Extract and upload it to your phpBB/ext/ folder so you have phpBB/ext/blitze/sitemaker
-* Go to "ACP" > "Customise" > "Extensions" and enable the "phpBB Sitemaker" extension.
+-   Download the extension from [here](https://www.phpbb.com/customise/db/extension/phpbb_sitemaker_2/)
+-   Extract and upload it to your phpBB/ext/ folder so you have phpBB/ext/blitze/sitemaker
+-   Go to "ACP" > "Customise" > "Extensions" and enable the "phpBB Sitemaker" extension.
 
 ## Upgrade from phpBB Primetime
 
-* Disable (do not Purge) phpBB Primetime
-* Install phpBB Sitemaker as described above
-* Purge phpBB Primetime
+-   Disable (do not Purge) phpBB Primetime
+-   Install phpBB Sitemaker as described above
+-   Purge phpBB Primetime
 
 ## Collaborate
 
-* Create a issue in the [tracker](https://github.com/blitze/phpBB-ext-sitemaker/issues)
-* Note the restrictions for [branch names](https://wiki.phpbb.com/Git#Branch_Names) and [commit messages](https://wiki.phpbb.com/Git#Commit_Messages) are similar to phpBB3
-* Submit a [pull-request](https://github.com/blitze/phpBB-ext-sitemaker/pulls)
-
-## Testing
-
-We use Travis-CI as a continuous integration server and phpunit for our unit testing. See more information on the [phpBB development wiki](https://wiki.phpbb.com/Unit_Tests).
+-   Create a issue in the [tracker](https://github.com/blitze/phpBB-ext-sitemaker/issues)
+-   Note the restrictions for [branch names](https://wiki.phpbb.com/Git#Branch_Names) and [commit messages](https://wiki.phpbb.com/Git#Commit_Messages) are similar to phpBB3
+-   Submit a [pull-request](https://github.com/blitze/phpBB-ext-sitemaker/pulls)
 
 ## License
 

README.md

@@ -83,7 +83,6 @@ public function display(array $bdata, $edit_mode = false)
 		try
 		{
 			$content = $this->render_feeds($feed_urls, $settings, $status);
-			$status = 1;
 		}
 		catch (\Exception $e)
 		{

blocks/feeds.php

@@ -87,11 +87,9 @@ public function display(array $bdata, $edit_mode = false)
 
 		$data = $this->members->get_list($bdata['settings']);
 
-		$data['RANGE'] = $this->translator->lang($this->range_options[$bdata['settings']['date_range']]);
-
-		if (empty($data['MEMBERS']))
+		if (!empty($data['MEMBERS']))
 		{
-			$data = [];
+			$data['RANGE'] = $this->translator->lang($this->range_options[$bdata['settings']['date_range']]);
 		}
 
 		return array(

blocks/members.php

@@ -27,7 +27,7 @@
 		"simplepie/simplepie": "^1.5"
 	},
 	"require-dev": {
-		"phing/phing": "2.4.*"
+		"phing/phing": "^2.16"
 	},
 	"extra": {
 		"display-name": "phpBB SiteMaker",
@@ -39,5 +39,8 @@
 			"directory": "/customise/db/extension/phpbb_sitemaker_2",
 			"filename": "version_check"
 		}
+	},
+	"config": {
+		"prepend-autoloader": false
 	}
 }