Add Laravel 7 support

dmitry-ivanov · May 5, 2020 · 9761010 · 9761010
1 parent ea8db65
commit 9761010
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 142 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ Grab Wikipedia (or another MediaWiki) page in Laravel.
 
 | Laravel | Wikipedia Grabber                                                            |
 | ------- | :--------------------------------------------------------------------------: |
+| 7.x     | [7.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/7.x)   |
 | 6.x     | [6.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/6.x)   |
 | 5.8.*   | [5.8.*](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/5.8) |
 | 5.7.*   | [5.7.*](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/5.7) |

diff --git a/composer.json b/composer.json
@@ -12,15 +12,15 @@
         "email": "dmitry.g.ivanov@gmail.com"
     }],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2.5",
         "ext-json": "*",
-        "guzzlehttp/guzzle": "^6.3",
-        "illuminate/support": "^6.0"
+        "guzzlehttp/guzzle": "^6.3.1|^7.0",
+        "illuminate/support": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.3",
-        "mockery/mockery": "^1.2",
-        "orchestra/testbench": "^4.0"
+        "phpunit/phpunit": "^8.4|^9.0",
+        "mockery/mockery": "^1.3.1",
+        "orchestra/testbench": "^5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/Grabber/PageTest/page-without-images.txt b/tests/Grabber/PageTest/page-without-images.txt
@@ -9,7 +9,7 @@
 .iwg-media-desc {padding:.625rem 1rem; font-size:0.95em; word-wrap:break-word}
 </style>
 
-<h1 id='ivanov-ivan-ivanovich-svyashchennik' class='iwg-section-title'>Иванов, Иван Иванович (священник)</h1>
+<h1 id='ivanov-ivan-ivanovic-svyashhennik' class='iwg-section-title'>Иванов, Иван Иванович (священник)</h1>
 <div class='iwg-section'>
 <div class='iwg-media right' style='width:300px'><a href='https://upload.wikimedia.org/wikipedia/commons/c/c0/Perrot_View_of_Sennaya_Square_1841.jpg' target='_blank'><img src='https://upload.wikimedia.org/wikipedia/commons/thumb/c/c0/Perrot_View_of_Sennaya_Square_1841.jpg/300px-Perrot_View_of_Sennaya_Square_1841.jpg' width='300' height='184' alt='Иванов, Иван Иванович (священник)' /></a><div class='iwg-media-desc'>Иванов, Иван Иванович (священник)</div></div>
 Иван Иванович Иванов (1796—1848) — протоиерей Русской православной церкви.<br />