6.1.1 Release

userfrosting · Dec 28, 2020 · 66e1033 · 66e1033
2 parents 2a17e54 + 5847d44
commit 66e1033
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 134 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -0,0 +1,40 @@
+name: Build
+
+on:
+  push:
+    branches: [master, develop]
+  pull_request:
+    branches: [master, develop]
+  schedule:
+  - cron: "0 0 * * 5"
+
+jobs:
+  PHPUnit:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php_versions: ['7.1', '7.2', '7.3', '7.4']
+        os: [ubuntu-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+    name: PHPUnit Tests - ${{ matrix.php_versions }} - ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup PHP, with composer and extensions
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php_versions }}
+        extensions: mbstring, dom, fileinfo, gd
+        coverage: xdebug
+        tools: pecl
+    - name: Install Dependencies
+      run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+    - name: Execute tests via PHPUnit
+      run: vendor/bin/phpunit
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        file: ./_meta/coverage.xml
+        fail_ci_if_error: true
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ composer.lock
 *.komodoproject
 .php_cs.cache
 _meta
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [6.1.1]
+- Replaced Travis & Appveyor with GitHub Action for build
+- Upgrade deprecation in tests
+
 ## [6.1.0] - 2020-03-17
 - Updated dependencies
 
@@ -76,6 +80,7 @@ Add custom exceptions.
 ## [1.0] - 2016-04-05
 Initial release.
 
+[6.1.1]: https://github.com/userfrosting/assets/compare/6.1.0...6.1.1
 [6.1.0]: https://github.com/userfrosting/assets/compare/6.0.0...6.1.0
 [6.0.0]: https://github.com/userfrosting/assets/compare/5.0.2...6.0.0
 [5.0.2]: https://github.com/userfrosting/assets/compare/5.0.1...5.0.2

diff --git a/README.md b/README.md
@@ -1,32 +1,29 @@
 # UserFrosting/Assets
 
-[![Latest Version][version-badge]][releases]
+[![Latest Version][assets-version]][Assets]
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
-[![Join the chat at https://chat.userfrosting.com/channel/support](https://demo.rocket.chat/images/join-chat.svg)](https://chat.userfrosting.com/channel/support)
+[![Join the chat at https://chat.userfrosting.com/channel/support](https://chat.userfrosting.com/api/v1/shield.svg?name=UserFrosting)](https://chat.userfrosting.com/channel/support)
 [![Donate](https://img.shields.io/badge/Open%20Collective-Donate-blue.svg)](https://opencollective.com/userfrosting#backer)
 
 | Branch | Build | Coverage | Style |
-| ------ | ----- | -------- | ----- |
-| [master][master] | [![Build Status][master-build-travis-badge]][travis] [![Windows Build][master-build-appveyor-badge]][appveyor] | [![codecov][master-codecov-badge]][codecov] | [![][master-styleci-badge]][styleci] |
-| [develop][develop] | [![Build Status][develop-build-travis-badge]][travis] [![Windows Build][develop-build-appveyor-badge]][appveyor] | [![codecov][develop-codecov-badge]][codecov] | [![][develop-styleci-badge]][styleci] |
+| ------ |:-----:|:--------:|:-----:|
+| [master][Assets]  | [![][assets-master-build]][assets-travis] | [![][assets-master-codecov]][assets-codecov] | [![][assets-style-develop]][assets-style] |
+| [develop][Assets-develop] | [![][assets-develop-build]][assets-travis] | [![][assets-develop-codecov]][assets-codecov] | [![][assets-style-develop]][assets-style] |
 
 <!-- Links -->
-[codecov]: https://codecov.io/gh/userfrosting/assets
-[releases]: https://github.com/userfrosting/assets/releases
-[styleci]: https://github.styleci.io/repos/55460230
-[travis]: https://travis-ci.org/userfrosting/assets
-[appveyor]: https://ci.appveyor.com/project/userfrosting/assets
-[version-badge]: https://img.shields.io/github/release/userfrosting/assets.svg
-[master]: https://github.com/userfrosting/assets/tree/master
-[master-styleci-badge]: https://github.styleci.io/repos/55460230/shield?branch=master&style=flat
-[master-codecov-badge]: https://codecov.io/gh/userfrosting/assets/branch/master/graph/badge.svg
-[master-build-travis-badge]: https://travis-ci.org/userfrosting/assets.svg?branch=master
-[master-build-appveyor-badge]: https://ci.appveyor.com/api/projects/status/github/userfrosting/assets?branch=master&svg=true
-[develop]: https://github.com/userfrosting/assets/tree/develop
-[develop-styleci-badge]: https://github.styleci.io/repos/55460230/shield?branch=develop&style=flat
-[develop-codecov-badge]: https://codecov.io/gh/userfrosting/assets/branch/develop/graph/badge.svg
-[develop-build-travis-badge]: https://travis-ci.org/userfrosting/assets.svg?branch=develop
-[develop-build-appveyor-badge]: https://ci.appveyor.com/api/projects/status/github/userfrosting/assets?branch=develop&svg=true
+[Assets]: https://github.com/userfrosting/assets
+[Assets-develop]: https://github.com/userfrosting/assets/tree/develop
+[assets-version]: https://img.shields.io/github/release/userfrosting/assets.svg
+[assets-master-build]: https://github.com/userfrosting/assets/workflows/Build/badge.svg?branch=master
+[assets-master-codecov]: https://codecov.io/gh/userfrosting/assets/branch/master/graph/badge.svg
+[assets-develop-build]: https://github.com/userfrosting/assets/workflows/Build/badge.svg?branch=develop
+[assets-develop-codecov]: https://codecov.io/gh/userfrosting/assets/branch/develop/graph/badge.svg
+[assets-releases]: https://github.com/userfrosting/assets/releases
+[assets-travis]: https://github.com/userfrosting/assets/actions?query=workflow%3ABuild
+[assets-codecov]: https://codecov.io/gh/userfrosting/assets
+[assets-style-master]: https://github.styleci.io/repos/55460230/shield?branch=master&style=flat
+[assets-style-develop]: https://github.styleci.io/repos/55460230/shield?branch=develop&style=flat
+[assets-style]: https://github.styleci.io/repos/55460230
 
 **Assets** is a library originally created for UserFrosting 4 to make it much easier to reference frontend assets in both production and development contexts.
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.13",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^7.5 | ^8.5",
         "slim/slim": "^3"
     },
     "suggest": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -19,4 +19,8 @@
           <directory suffix=".php">src/</directory>
       </whitelist>
     </filter>
+    <logging>
+        <log type="coverage-html" target="_meta/coverage"/>
+        <log type="coverage-clover" target="_meta/coverage.xml"/>
+    </logging>
 </phpunit>
diff --git a/tests/AssetBundles/GulpBundleAssetsCompiledBundlesTest.php b/tests/AssetBundles/GulpBundleAssetsCompiledBundlesTest.php
@@ -55,7 +55,6 @@ public function testConstructInvalidJsBundle()
      *
      * @param GulpBundleAssetsCompiledBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */
@@ -71,7 +70,6 @@ public function testGetCssBundleAssets(GulpBundleAssetsCompiledBundles $bundles)
      *
      * @param GulpBundleAssetsCompiledBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */
@@ -86,7 +84,6 @@ public function testGetCssBundleAssetsOutOfRange(GulpBundleAssetsCompiledBundles
      *
      * @param GulpBundleAssetsCompiledBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */
@@ -102,7 +99,6 @@ public function testGetJsBundleAssets(GulpBundleAssetsCompiledBundles $bundles)
      *
      * @param GulpBundleAssetsCompiledBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */

diff --git a/tests/AssetBundles/GulpBundleAssetsRawBundlesTest.php b/tests/AssetBundles/GulpBundleAssetsRawBundlesTest.php
@@ -93,7 +93,6 @@ public function testConstructInvalidJsBundle()
      *
      * @param GulpBundleAssetsRawBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */
@@ -109,7 +108,6 @@ public function testGetCssBundleAssets(GulpBundleAssetsRawBundles $bundles)
      *
      * @param GulpBundleAssetsRawBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */
@@ -124,7 +122,6 @@ public function testGetCssBundleAssetsOutOfRange(GulpBundleAssetsRawBundles $bun
      *
      * @param GulpBundleAssetsRawBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */
@@ -141,7 +138,6 @@ public function testGetJsBundleAssets(GulpBundleAssetsRawBundles $bundles)
      *
      * @param GulpBundleAssetsRawBundles $bundles
      *
-     * @return void
      *
      * @depends testConstruct
      */

diff --git a/tests/AssetsTemplatePluginTest.php b/tests/AssetsTemplatePluginTest.php
@@ -31,10 +31,8 @@ class AssetsTemplatePluginTest extends TestCase
 
     /**
      * Initializes test environment.
-     *
-     * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->basePath = __DIR__.'/data';
         $this->baseUrl = 'https://assets.userfrosting.com/assets/';
@@ -67,7 +65,6 @@ public function testConstructAssetsTemplatePlugin()
      *
      * @param AssetsTemplatePlugin $plugin
      *
-     * @return void
      *
      * @depends testConstructAssetsTemplatePlugin
      */
@@ -81,7 +78,6 @@ public function testJsBundle(AssetsTemplatePlugin $plugin)
      *
      * @param AssetsTemplatePlugin $plugin
      *
-     * @return void
      *
      * @depends testConstructAssetsTemplatePlugin
      */
@@ -95,7 +91,6 @@ public function testJsBundleWithAttributes(AssetsTemplatePlugin $plugin)
      *
      * @param AssetsTemplatePlugin $plugin
      *
-     * @return void
      *
      * @depends testConstructAssetsTemplatePlugin
      */
@@ -109,7 +104,6 @@ public function testCssBundle(AssetsTemplatePlugin $plugin)
      *
      * @param AssetsTemplatePlugin $plugin
      *
-     * @return void
      *
      * @depends testConstructAssetsTemplatePlugin
      */
@@ -123,7 +117,6 @@ public function testCssBundleWithAttributes(AssetsTemplatePlugin $plugin)
      *
      * @param AssetsTemplatePlugin $plugin
      *
-     * @return void
      *
      * @depends testConstructAssetsTemplatePlugin
      */