Laravel 10 support

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.0, 8.1]
+        php: [8.1, 8.2]
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} / ${{ matrix.stability }}
@@ -37,7 +37,7 @@ jobs:
           command: composer update --prefer-dist --${{ matrix.stability }} --no-interaction --no-progress --ansi
 
       - name: Run tests
-        run: vendor/bin/phpunit --verbose --colors=always --coverage-clover ./build/logs/clover.xml
+        run: vendor/bin/phpunit --colors=always --coverage-clover ./build/logs/clover.xml
 
       - name: Code coverage
         uses: codecov/codecov-action@v1

.gitignore

@@ -1,4 +1,5 @@
 /.idea
+/.phpunit.cache
 /.vscode
 /vendor
 .DS_Store

README.md

@@ -5,8 +5,8 @@
 [<img src="https://user-images.githubusercontent.com/1286821/181085373-12eee197-187a-4438-90fe-571ac6d68900.png" alt="Buy me a coffee" width="200" />](https://buymeacoffee.com/dmitry.ivanov)
 
 [![StyleCI](https://github.styleci.io/repos/117998599/shield?branch=master&style=flat)](https://github.styleci.io/repos/117998599?branch=master)
-[![Build Status](https://img.shields.io/github/workflow/status/dmitry-ivanov/laravel-wikipedia-grabber/tests/master)](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/actions?query=workflow%3Atests+branch%3Amaster)
-[![Coverage Status](https://img.shields.io/codecov/c/github/dmitry-ivanov/laravel-wikipedia-grabber/master)](https://app.codecov.io/gh/dmitry-ivanov/laravel-wikipedia-grabber/branch/master)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/dmitry-ivanov/laravel-wikipedia-grabber/tests.yml?branch=master)](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/actions?query=workflow%3Atests+branch%3Amaster)
+[![Coverage Status](https://img.shields.io/codecov/c/github/dmitry-ivanov/laravel-wikipedia-grabber/master)](https://app.codecov.io/gh/dmitry-ivanov/laravel-wikipedia-grabber/tree/master)
 
 ![Packagist Version](https://img.shields.io/packagist/v/illuminated/wikipedia-grabber)
 ![Packagist Stars](https://img.shields.io/packagist/stars/illuminated/wikipedia-grabber)
@@ -17,6 +17,8 @@ Wikipedia/MediaWiki Grabber for Laravel.
 
 | Laravel | Wikipedia Grabber                                                            |
 |---------|------------------------------------------------------------------------------|
+| 11.x    | _[Support](https://buymeacoffee.com/dmitry.ivanov)_ ☕                        |
+| 10.x    | [10.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/10.x) |
 | 9.x     | [9.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/9.x)   |
 | 8.x     | [8.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/8.x)   |
 | 7.x     | [7.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/7.x)   |
@@ -144,5 +146,4 @@ $sections->push(
 
 Laravel Wikipedia Grabber is open-sourced software licensed under the [MIT license](LICENSE.md).
 
-[<img src="https://user-images.githubusercontent.com/1286821/43086829-ff7c006e-8ea6-11e8-8b03-ecf97ca95b2e.png" alt="Support on Patreon" width="125" />](https://patreon.com/dmitryivanov)&nbsp;
 [<img src="https://user-images.githubusercontent.com/1286821/181085373-12eee197-187a-4438-90fe-571ac6d68900.png" alt="Buy me a coffee" width="200" />](https://buymeacoffee.com/dmitry.ivanov)&nbsp;

composer.json

@@ -12,16 +12,15 @@
         "email": "[email protected]"
     }],
     "require": {
-        "php": "^8.0.2",
-        "guzzlehttp/guzzle": "^7.2",
+        "php": "^8.1",
+        "guzzlehttp/guzzle": "^7.5",
         "guzzlehttp/psr7": "^2.0",
-        "illuminate/support": "^9.0",
-        "ramsey/collection": "^1.2"
+        "illuminate/support": "^10.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.10",
-        "mockery/mockery": "^1.4.4",
-        "orchestra/testbench": "^7.0"
+        "phpunit/phpunit": "^10.5",
+        "mockery/mockery": "^1.5.1",
+        "orchestra/testbench": "^8.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     backupGlobals="false"
-    backupStaticAttributes="false"
+    backupStaticProperties="false"
     beStrictAboutTestsThatDoNotTestAnything="false"
     beStrictAboutOutputDuringTests="true"
     bootstrap="vendor/autoload.php"
+    cacheDirectory=".phpunit.cache"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnError="false"
     stopOnFailure="false"
-    verbose="true"
 >
     <testsuites>
         <testsuite name="Laravel Wikipedia Grabber Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
 
-    <coverage processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">./src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

tests/Grabber/PageTest/page-with-images-when-disabled.txt

@@ -64,7 +64,7 @@ Nested tables are a set of small tables of graduated size that can be stacked to
 Historically, various types of tables have become popular for specific uses:<br />
 <br />
 Loo tables were very popular in the 18th and 19th centuries as candlestands, tea tables, or small dining tables, although they were originally made for the popular card game loo or lanterloo. Their typically round or oval tops have a tilting mechanism, which enables them to be stored out of the way (e.g. in room corners) when not in use. A further development in this direction was the "birdcage" table, the top of which could both revolve and tilt.<br />
-Pembroke tables,  first introduced during the 18th century, were popular throughout the 19th century. Their main characteristic was a rectangular or oval top with folding or  drop leaves on each side. Most examples have one or more drawers and four legs, sometimes connected by stretchers. Their design meant they could easily be stored or moved about and conveniently opened for serving tea, dining, writing, or other occasional uses. One account attributes the design of the Pembroke table to Henry Herbert, 9th Earl of Pembroke (1693-1751).Sofa tables are similar to Pembroke tables and usually have longer and narrower tops. They were specifically designed for placement directly in front of sofas for serving tea, writing, dining, or other convenient uses. Generally speaking, a sofa table is a tall, narrow table used behind a sofa to hold lamps or decorative objects.<br />
+Pembroke tables,  first introduced during the 18th century, were popular throughout the 19th century. Their main characteristic was a rectangular or oval top with folding or drop leaves on each side. Most examples have one or more drawers and four legs, sometimes connected by stretchers. Their design meant they could easily be stored or moved about and conveniently opened for serving tea, dining, writing, or other occasional uses. One account attributes the design of the Pembroke table to Henry Herbert, 9th Earl of Pembroke (1693-1751).Sofa tables are similar to Pembroke tables and usually have longer and narrower tops. They were specifically designed for placement directly in front of sofas for serving tea, writing, dining, or other convenient uses. Generally speaking, a sofa table is a tall, narrow table used behind a sofa to hold lamps or decorative objects.<br />
 Work tables were small tables designed to hold sewing materials and implements, providing a convenient work place for women who sewed. They appeared during the 18th century and were popular throughout the 19th century. Most examples have rectangular tops, sometimes with folding leaves, and usually one or more drawers fitted with partitions. Early examples typically have four legs, often standing on casters, while later examples sometimes have turned columns or other forms of support.<br />
 Drum tables are round tables introduced for writing, with drawers around the platform.<br />
 End tables are small tables typically placed beside couches or armchairs. Often lamps will be placed on an end table.<br />

tests/Grabber/PageTest/page-with-images-when-enabled.txt

@@ -89,7 +89,7 @@ Nested tables are a set of small tables of graduated size that can be stacked to
 Historically, various types of tables have become popular for specific uses:<br />
 <br />
 Loo tables were very popular in the 18th and 19th centuries as candlestands, tea tables, or small dining tables, although they were originally made for the popular card game loo or lanterloo. Their typically round or oval tops have a tilting mechanism, which enables them to be stored out of the way (e.g. in room corners) when not in use. A further development in this direction was the "birdcage" table, the top of which could both revolve and tilt.<br />
-Pembroke tables,  first introduced during the 18th century, were popular throughout the 19th century. Their main characteristic was a rectangular or oval top with folding or  drop leaves on each side. Most examples have one or more drawers and four legs, sometimes connected by stretchers. Their design meant they could easily be stored or moved about and conveniently opened for serving tea, dining, writing, or other occasional uses. One account attributes the design of the Pembroke table to Henry Herbert, 9th Earl of Pembroke (1693-1751).Sofa tables are similar to Pembroke tables and usually have longer and narrower tops. They were specifically designed for placement directly in front of sofas for serving tea, writing, dining, or other convenient uses. Generally speaking, a sofa table is a tall, narrow table used behind a sofa to hold lamps or decorative objects.<br />
+Pembroke tables,  first introduced during the 18th century, were popular throughout the 19th century. Their main characteristic was a rectangular or oval top with folding or drop leaves on each side. Most examples have one or more drawers and four legs, sometimes connected by stretchers. Their design meant they could easily be stored or moved about and conveniently opened for serving tea, dining, writing, or other occasional uses. One account attributes the design of the Pembroke table to Henry Herbert, 9th Earl of Pembroke (1693-1751).Sofa tables are similar to Pembroke tables and usually have longer and narrower tops. They were specifically designed for placement directly in front of sofas for serving tea, writing, dining, or other convenient uses. Generally speaking, a sofa table is a tall, narrow table used behind a sofa to hold lamps or decorative objects.<br />
 Work tables were small tables designed to hold sewing materials and implements, providing a convenient work place for women who sewed. They appeared during the 18th century and were popular throughout the 19th century. Most examples have rectangular tops, sometimes with folding leaves, and usually one or more drawers fitted with partitions. Early examples typically have four legs, often standing on casters, while later examples sometimes have turned columns or other forms of support.<br />
 Drum tables are round tables introduced for writing, with drawers around the platform.<br />
 End tables are small tables typically placed beside couches or armchairs. Often lamps will be placed on an end table.<br />