Merge pull request #52 from asdfdotdev/development

Update for v5.8
asdfdotdev · Aug 8, 2021 · a66410a · a66410a
2 parents 864cc6e + 607f05d
commit a66410a
Show file tree

Hide file tree

Showing 16 changed files with 1,986 additions and 17,020 deletions.
diff --git a/.github/workflows/phpunit-tests-7.yml b/.github/workflows/phpunit-tests-7.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '7.4', '7.3' ]
-        wordpress-versions: [ 'nightly', '5.7', '5.6', '5.5', '5.4' ]
+        wordpress-versions: [ '5.8', '5.7', '5.6', '5.5' ]
         operating-system: [ ubuntu-18.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}

diff --git a/.github/workflows/phpunit-tests-legacy-56.yml b/.github/workflows/phpunit-tests-legacy-56.yml
@@ -30,8 +30,8 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '5.6' ]
-        wordpress-versions: [ 'nightly', '4.9', '4.8', '4.7' ]
-        operating-system: [ ubuntu-16.04 ]
+        wordpress-versions: [ '4.9', '4.8', '4.7' ]
+        operating-system: [ ubuntu-18.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
       UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}}

diff --git a/.github/workflows/phpunit-tests-legacy-7.yml b/.github/workflows/phpunit-tests-legacy-7.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '7.2', '7.1', '7.0' ]
-        wordpress-versions: [ 'nightly', '5.3', '5.2', '5.1', '5.0' ]
+        wordpress-versions: [ '5.4', '5.3', '5.2', '5.1', '5.0' ]
         operating-system: [ ubuntu-18.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}

diff --git a/.github/workflows/phpunit-tests-nightly-7.yml b/.github/workflows/phpunit-tests-nightly-7.yml
@@ -0,0 +1,76 @@
+name: PHPUnit Tests Nightly (7.x)
+
+on:
+  push:
+    branches:
+      - main
+      - development
+  pull_request:
+    branches:
+    types: [closed]
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  test-php:
+    name: WordPress ${{ matrix.wordpress-versions }} - PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.operating-system }}
+    services:
+      mysql-service:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+    strategy:
+      matrix:
+        php-versions: [ '7.4', '7.3' ]
+        wordpress-versions: [ 'nightly' ]
+        operating-system: [ ubuntu-18.04 ]
+    env:
+      UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
+      UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}}
+      UTMDC_PLUGIN_DIR: ${{secrets.UTMDC_PLUGIN_DIR}}
+
+    steps:
+      - name: Start MySQL
+        run: sudo /etc/init.d/mysql start
+
+      - name: Setup PHP
+        # Commit hash for v2.9.0: https://github.com/shivammathur/setup-php/releases/tag/2.9.0
+        uses: shivammathur/setup-php@50980172517227701a2db688415a86573987b6df
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring
+          ini-values: post_max_size=256M, max_execution_time=180
+          coverage: xdebug
+
+      - name: Log Debug Information
+        run: |
+          echo "$GITHUB_REF"
+          echo "$GITHUB_EVENT_NAME"
+          php --version
+          mysql --version
+
+      - name: Checkout utm.codes
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install PHPUnit
+        run: |
+          composer require phpunit/phpunit:^7 --update-with-dependencies
+
+      - name: Install WordPress
+        run: |
+          bash _test/bin/install-wp-tests.sh wordpress_test root root localhost:3306 ${{ matrix.wordpress-versions }}
+
+      - name: Run PHPUnit Tests
+        run: |
+          cd _test
+          ../vendor/bin/phpunit
diff --git a/.github/workflows/phpunit-tests-nightly-legacy-56.yml b/.github/workflows/phpunit-tests-nightly-legacy-56.yml
@@ -0,0 +1,76 @@
+name: PHPUnit Tests Nightly (Legacy 5.6)
+
+on:
+  push:
+    branches:
+      - main
+      - development
+  pull_request:
+    branches:
+    types: [closed]
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  test-php:
+    name: WordPress ${{ matrix.wordpress-versions }} - PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.operating-system }}
+    services:
+      mysql-service:
+        image: mysql:5.6
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+    strategy:
+      matrix:
+        php-versions: [ '5.6' ]
+        wordpress-versions: [ 'nightly' ]
+        operating-system: [ ubuntu-18.04 ]
+    env:
+      UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
+      UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}}
+      UTMDC_PLUGIN_DIR: ${{secrets.UTMDC_PLUGIN_DIR}}
+
+    steps:
+      - name: Start MySQL
+        run: sudo /etc/init.d/mysql start
+
+      - name: Setup PHP
+        # Commit hash for v2.9.0: https://github.com/shivammathur/setup-php/releases/tag/2.9.0
+        uses: shivammathur/setup-php@50980172517227701a2db688415a86573987b6df
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring
+          ini-values: post_max_size=256M, max_execution_time=180
+          coverage: xdebug
+
+      - name: Log Debug Information
+        run: |
+          echo "$GITHUB_REF"
+          echo "$GITHUB_EVENT_NAME"
+          php --version
+          mysql --version
+
+      - name: Checkout utm.codes
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install PHPUnit
+        run: |
+          composer require phpunit/phpunit:^5 --update-with-dependencies
+
+      - name: Install WordPress
+        run: |
+          bash _test/bin/install-wp-tests.sh wordpress_test root root localhost:3306 ${{ matrix.wordpress-versions }}
+
+      - name: Run PHPUnit Tests
+        run: |
+          cd _test
+          ../vendor/bin/phpunit
diff --git a/.github/workflows/phpunit-tests-nightly-legacy-7.yml b/.github/workflows/phpunit-tests-nightly-legacy-7.yml
@@ -0,0 +1,77 @@
+name: PHPUnit Tests Nightly (Legacy 7.x)
+
+on:
+  push:
+    branches:
+      - main
+      - development
+  pull_request:
+    branches:
+    types: [closed]
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  test-php:
+    name: WordPress ${{ matrix.wordpress-versions }} - PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.operating-system }}
+    services:
+      mysql-service:
+        image: mysql:5.6
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+    strategy:
+      matrix:
+        php-versions: [ '7.2', '7.1', '7.0' ]
+        wordpress-versions: [ 'nightly' ]
+        operating-system: [ ubuntu-18.04 ]
+    env:
+      UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
+      UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}}
+      UTMDC_PLUGIN_DIR: ${{secrets.UTMDC_PLUGIN_DIR}}
+
+    steps:
+      - name: Start MySQL
+        run: sudo /etc/init.d/mysql start
+
+      - name: Setup PHP
+        # Commit hash for v2.9.0: https://github.com/shivammathur/setup-php/releases/tag/2.9.0
+        uses: shivammathur/setup-php@50980172517227701a2db688415a86573987b6df
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, mysqli
+          ini-values: post_max_size=256M, max_execution_time=180
+          coverage: xdebug
+
+      - name: Log Debug Information
+        run: |
+          echo "$GITHUB_REF"
+          echo "$GITHUB_EVENT_NAME"
+          echo "WordPress $WORDPRESS_VERSION"
+          php --version
+          mysql --version
+
+      - name: Checkout utm.codes
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install PHPUnit
+        run: |
+          composer require phpunit/phpunit:^6 --update-with-dependencies
+
+      - name: Install WordPress
+        run: |
+          bash _test/bin/install-wp-tests.sh wordpress_test root root localhost:3306 ${{ matrix.wordpress-versions }}
+
+      - name: Run PHPUnit Tests
+        run: |
+          cd _test
+          ../vendor/bin/phpunit
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v14.17.4
diff --git a/README.txt b/README.txt
@@ -3,9 +3,9 @@ Contributors: chrislarrycarl
 Donate link: https://utm.codes/pricing/
 Tags: analytics, utm codes, analytics, google analytics, campaign marketing, link generator
 Requires at least: 4.7.0
-Tested up to: 5.7
+Tested up to: 5.8
 Requires PHP: 5.6.0
-Stable tag: 1.7.5
+Stable tag: 1.7.6
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -97,6 +97,11 @@ That isn't a question. But thank you.
 
 == Changelog ==
 
+= 1.7.6 =
+
+- Supports WordPress v5.8
+- Update dependencies
+
 = 1.7.5 =
 
 - Supports WordPress v5.7

diff --git a/_build/styles/mixins/_toggle.scss b/_build/styles/mixins/_toggle.scss
@@ -1,7 +1,9 @@
+@use "sass:math";
+
 @mixin css-toggle($off-color: #444444, $on-color: #0073aa, $button-color: #ffffff, $text-color: #ffffff, $width: 140px, $height: 36px) {
 
 	$shadow: 0 3px 3px rgba(black, 0.4);
-	$switch-width: $width/2;
+	$switch-width: math.div($width, 2);
 	$offset: 2px;
 	$transition: cubic-bezier(0, 1, 0.5, 1);
 
@@ -75,9 +77,9 @@
 
 			&:before {
 				color: $text-color;
-				left: $width/2;
+				left: math.div($width, 2);
 				line-height: $height;
-				width: $width/2;
+				width: math.div($width, 2);
 				content: attr(data-on);
 				top: 0;
 			}

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "asdfdotdev/utm.codes",
-    "version": "1.7.5",
+    "version": "1.7.6",
     "description": "A plugin that makes building analytics friendly links quick and easy.",
     "type": "wordpress-plugin",
     "require-dev": {