Merge branch '7.2RC'7.2

3 files changed, 52 insertions, 5 deletions

diff --git a/vendor/jbroadway/urlify/.github/workflows/ci.yml b/vendor/jbroadway/urlify/.github/workflows/ci.yml
new file mode 100644
index 000000000..869334f57
--- /dev/null
+++ b/vendor/jbroadway/urlify/.github/workflows/ci.yml
@@ -0,0 +1,41 @@
+name: "Continuous Integration"
+
+on:
+  - push
+  - pull_request
+
+env:
+  COMPOSER_FLAGS: "--no-interaction --prefer-dist"
+
+jobs:
+  tests:
+    name: "CI"
+    
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        php-version:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          - "8.0"
+        
+        dependencies: [highest]
+    
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+    
+      - name: "Setup PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+    
+      - name: "Install dependencies"
+        run: |
+          composer update ${{ env.COMPOSER_FLAGS }}
+    
+      - name: "Run tests"
+        run: "composer exec phpunit -- --verbose"
diff --git a/vendor/jbroadway/urlify/README.md b/vendor/jbroadway/urlify/README.md
index 74780485f..0dcfab189 100644
--- a/vendor/jbroadway/urlify/README.md
+++ b/vendor/jbroadway/urlify/README.md
@@ -1,4 +1,10 @@
-# URLify for PHP [![Build Status](https://travis-ci.org/jbroadway/urlify.png)](https://travis-ci.org/jbroadway/urlify)
+# URLify for PHP
+
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/jbroadway/urlify/Continuous%20Integration/master)
+![Packagist License](https://img.shields.io/packagist/l/jbroadway/urlify)
+![Packagist Version](https://img.shields.io/packagist/v/jbroadway/urlify)
+![Packagist PHP Version Support](https://img.shields.io/packagist/php-v/jbroadway/urlify)
+![Packagist Downloads](https://img.shields.io/packagist/dt/jbroadway/urlify)
 
 A fast PHP slug generator and transliteration library, started as a PHP port of
 [URLify.js](https://github.com/django/django/blob/master/django/contrib/admin/static/admin/js/urlify.js)
diff --git a/vendor/jbroadway/urlify/composer.json b/vendor/jbroadway/urlify/composer.json
index a7731b0ea..d24b8a2d9 100644
--- a/vendor/jbroadway/urlify/composer.json
+++ b/vendor/jbroadway/urlify/composer.json
@@ -1,8 +1,8 @@
 {
 	"name": "jbroadway/urlify",
 	"type": "library",
-	"description": "PHP port of URLify.js from the Django project. Transliterates non-ascii characters for use in URLs.",
-	"keywords": ["urlify","transliterate","translit","transliteration","url","encode","slug","link","iconv"],
+	"description": "A fast PHP slug generator and transliteration library that converts non-ascii characters for use in URLs.",
+	"keywords": ["urlify","transliterate","translit","transliteration","url","encode","downcode","slug","slugify","slugs","link","iconv","blogging","blogs","unicode","ascii","seo"],
 	"homepage": "https://github.com/jbroadway/urlify",
 	"license": "BSD-3-Clause-Clear",
 	"authors": [
@@ -13,12 +13,12 @@
 		}
 	],
 	"require": {
-		"php": ">=7.2.0",
+		"php": ">=7.2",
 		"voku/portable-ascii": "^1.4",
 		"voku/stop-words": "^2.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~6.0 || ~7.0"
+		"phpunit/phpunit": "^8.5"
 	},
 	"autoload": {
 		"psr-0": { "URLify": "" }