Skip to content

Commit eee3c97

Browse files
committed
Laravel 10 support
1 parent 07ffa5c commit eee3c97

7 files changed

+20
-22
lines changed

.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
php: [8.0, 8.1]
11+
php: [8.1, 8.2]
1212
stability: [prefer-lowest, prefer-stable]
1313

1414
name: PHP ${{ matrix.php }} / ${{ matrix.stability }}
@@ -37,7 +37,7 @@ jobs:
3737
command: composer update --prefer-dist --${{ matrix.stability }} --no-interaction --no-progress --ansi
3838

3939
- name: Run tests
40-
run: vendor/bin/phpunit --verbose --colors=always --coverage-clover ./build/logs/clover.xml
40+
run: vendor/bin/phpunit --colors=always --coverage-clover ./build/logs/clover.xml
4141

4242
- name: Code coverage
4343
uses: codecov/codecov-action@v1

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/.idea
2+
/.phpunit.cache
23
/.vscode
34
/vendor
45
.DS_Store

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
[<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)
66

77
[![StyleCI](https://github.styleci.io/repos/117998599/shield?branch=master&style=flat)](https://github.styleci.io/repos/117998599?branch=master)
8-
[![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)
9-
[![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)
8+
[![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)
9+
[![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)
1010

1111
![Packagist Version](https://img.shields.io/packagist/v/illuminated/wikipedia-grabber)
1212
![Packagist Stars](https://img.shields.io/packagist/stars/illuminated/wikipedia-grabber)
@@ -17,6 +17,8 @@ Wikipedia/MediaWiki Grabber for Laravel.
1717

1818
| Laravel | Wikipedia Grabber |
1919
|---------|------------------------------------------------------------------------------|
20+
| 11.x | _[Support](https://buymeacoffee.com/dmitry.ivanov)_|
21+
| 10.x | [10.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/10.x) |
2022
| 9.x | [9.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/9.x) |
2123
| 8.x | [8.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/8.x) |
2224
| 7.x | [7.x](https://github.com/dmitry-ivanov/laravel-wikipedia-grabber/tree/7.x) |
@@ -144,5 +146,4 @@ $sections->push(
144146
145147
Laravel Wikipedia Grabber is open-sourced software licensed under the [MIT license](LICENSE.md).
146148
147-
[<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;
148149
[<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

+6-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@
1212
"email": "[email protected]"
1313
}],
1414
"require": {
15-
"php": "^8.0.2",
16-
"guzzlehttp/guzzle": "^7.2",
15+
"php": "^8.1",
16+
"guzzlehttp/guzzle": "^7.5",
1717
"guzzlehttp/psr7": "^2.0",
18-
"illuminate/support": "^9.0",
19-
"ramsey/collection": "^1.2"
18+
"illuminate/support": "^10.0"
2019
},
2120
"require-dev": {
22-
"phpunit/phpunit": "^9.5.10",
23-
"mockery/mockery": "^1.4.4",
24-
"orchestra/testbench": "^7.0"
21+
"phpunit/phpunit": "^10.5",
22+
"mockery/mockery": "^1.5.1",
23+
"orchestra/testbench": "^8.0"
2524
},
2625
"autoload": {
2726
"psr-4": {

phpunit.xml.dist

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
33
backupGlobals="false"
4-
backupStaticAttributes="false"
4+
backupStaticProperties="false"
55
beStrictAboutTestsThatDoNotTestAnything="false"
66
beStrictAboutOutputDuringTests="true"
77
bootstrap="vendor/autoload.php"
8+
cacheDirectory=".phpunit.cache"
89
colors="true"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
1210
processIsolation="false"
1311
stopOnError="false"
1412
stopOnFailure="false"
15-
verbose="true"
1613
>
1714
<testsuites>
1815
<testsuite name="Laravel Wikipedia Grabber Test Suite">
1916
<directory suffix="Test.php">./tests</directory>
2017
</testsuite>
2118
</testsuites>
2219

23-
<coverage processUncoveredFiles="true">
20+
<source>
2421
<include>
2522
<directory suffix=".php">./src</directory>
2623
</include>
27-
</coverage>
24+
</source>
2825
</phpunit>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Nested tables are a set of small tables of graduated size that can be stacked to
6464
Historically, various types of tables have become popular for specific uses:<br />
6565
<br />
6666
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 />
67-
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 />
67+
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 />
6868
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 />
6969
Drum tables are round tables introduced for writing, with drawers around the platform.<br />
7070
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Nested tables are a set of small tables of graduated size that can be stacked to
8989
Historically, various types of tables have become popular for specific uses:<br />
9090
<br />
9191
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 />
92-
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 />
92+
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 />
9393
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 />
9494
Drum tables are round tables introduced for writing, with drawers around the platform.<br />
9595
End tables are small tables typically placed beside couches or armchairs. Often lamps will be placed on an end table.<br />

0 commit comments

Comments
 (0)