Skip to content

Commit 5694880

Browse files
warifpwarifp
committed
❤️
Update composer system
1 parent 7c2bfd9 commit 5694880

File tree

29 files changed

+523
-198
lines changed

29 files changed

+523
-198
lines changed

‎composer.lock

Lines changed: 20 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/composer/installed.json

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[
22
{
33
"name": "league/climate",
4-
"version": "3.5.0",
5-
"version_normalized": "3.5.0.0",
4+
"version": "3.5.2",
5+
"version_normalized": "3.5.2.0",
66
"source": {
77
"type": "git",
88
"url": "https://github.com/thephpleague/climate.git",
9-
"reference": "0d2fdbf8829f60f6ba6433df68d6f3fe1271b8e6"
9+
"reference": "6b53a28a58ad9f5f63042e291eb870cf0d02a9c9"
1010
},
1111
"dist": {
1212
"type": "zip",
13-
"url": "https://api.github.com/repos/thephpleague/climate/zipball/0d2fdbf8829f60f6ba6433df68d6f3fe1271b8e6",
14-
"reference": "0d2fdbf8829f60f6ba6433df68d6f3fe1271b8e6",
13+
"url": "https://api.github.com/repos/thephpleague/climate/zipball/6b53a28a58ad9f5f63042e291eb870cf0d02a9c9",
14+
"reference": "6b53a28a58ad9f5f63042e291eb870cf0d02a9c9",
1515
"shasum": ""
1616
},
1717
"require": {
@@ -27,7 +27,7 @@
2727
"suggest": {
2828
"ext-mbstring": "If ext-mbstring is not available you MUST install symfony/polyfill-mbstring"
2929
},
30-
"time": "2019-02-10T18:25:19+00:00",
30+
"time": "2019-12-01T15:25:43+00:00",
3131
"type": "library",
3232
"installation-source": "dist",
3333
"autoload": {
@@ -40,17 +40,17 @@
4040
"MIT"
4141
],
4242
"authors": [
43-
{
44-
"name": "Craig Duncan",
45-
"email": "git@duncanc.co.uk",
46-
"homepage": "https://github.com/duncan3dc",
47-
"role": "Developer"
48-
},
4943
{
5044
"name": "Joe Tannenbaum",
5145
"email": "hey@joe.codes",
5246
"homepage": "http://joe.codes/",
5347
"role": "Developer"
48+
},
49+
{
50+
"name": "Craig Duncan",
51+
"email": "git@duncanc.co.uk",
52+
"homepage": "https://github.com/duncan3dc",
53+
"role": "Developer"
5454
}
5555
],
5656
"description": "PHP's best friend for the terminal. CLImate allows you to easily output colored text, special formats, and more.",
@@ -64,30 +64,34 @@
6464
},
6565
{
6666
"name": "paquettg/php-html-parser",
67-
"version": "2.1.0",
68-
"version_normalized": "2.1.0.0",
67+
"version": "2.2.1",
68+
"version_normalized": "2.2.1.0",
6969
"source": {
7070
"type": "git",
7171
"url": "https://github.com/paquettg/php-html-parser.git",
72-
"reference": "d1000936350fed2cb6c54058890d2d19c5ccba4f"
72+
"reference": "668c770fc5724ea3f15b8791435f054835be8d5e"
7373
},
7474
"dist": {
7575
"type": "zip",
76-
"url": "https://api.github.com/repos/paquettg/php-html-parser/zipball/d1000936350fed2cb6c54058890d2d19c5ccba4f",
77-
"reference": "d1000936350fed2cb6c54058890d2d19c5ccba4f",
76+
"url": "https://api.github.com/repos/paquettg/php-html-parser/zipball/668c770fc5724ea3f15b8791435f054835be8d5e",
77+
"reference": "668c770fc5724ea3f15b8791435f054835be8d5e",
7878
"shasum": ""
7979
},
8080
"require": {
81+
"ext-curl": "*",
8182
"ext-mbstring": "*",
83+
"ext-zlib": "*",
8284
"paquettg/string-encode": "~1.0.0",
8385
"php": ">=7.1"
8486
},
8587
"require-dev": {
88+
"infection/infection": "^0.13.4",
8689
"mockery/mockery": "^1.2",
90+
"phan/phan": "^2.4",
8791
"php-coveralls/php-coveralls": "^2.1",
8892
"phpunit/phpunit": "^7.5.1"
8993
},
90-
"time": "2019-08-18T18:27:45+00:00",
94+
"time": "2020-01-20T12:59:15+00:00",
9195
"type": "library",
9296
"installation-source": "dist",
9397
"autoload": {

‎vendor/league/climate/.github/workflows/buildcheck.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
on:
2+
push:
3+
schedule:
4+
- cron: 0 10 1 * *
5+
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
php:
13+
- 7.1
14+
- 7.2
15+
- 7.3
16+
- 7.4-rc
17+
composer:
18+
- ""
19+
- "--prefer-lowest"
20+
21+
steps:
22+
- uses: actions/checkout@v1
23+
24+
- name: Create Docker Container
25+
run: |
26+
docker build . -t ci-image --build-arg PHP_VERSION=${{ matrix.php }}
27+
docker run --interactive --detach --volume ${{ github.workspace }}:/app --name ci ci-image
28+
29+
- name: Install Dependencies
30+
run: docker exec ci composer update --no-interaction --no-ansi --prefer-dist ${{ matrix.composer }}
31+
32+
- name: PHPUnit
33+
run: docker exec ci vendor/bin/phpunit
34+
35+
- name: Composer Validate
36+
run: docker exec ci composer validate --strict
37+
38+
windows:
39+
runs-on: windows-2019
40+
steps:
41+
- uses: actions/checkout@master
42+
- uses: nanasess/setup-php@master
43+
- uses: nanasess/composer-installer-action@master
44+
- name: Install dependencies
45+
run: composer update
46+
- name: Run test suite
47+
run: vendor/bin/phpunit

‎vendor/league/climate/CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
Changelog
22
=========
33

4+
--------
5+
6+
## 3.5.2 - 2019-12-01
7+
8+
### Fixed
9+
10+
* [Checkbox] Ensure we can output when the terminal width is unknown. [#156](https://github.com/thephpleague/climate/pull/156)
11+
12+
--------
13+
14+
## 3.5.1 - 2019-11-24
15+
16+
### Fixed
17+
18+
* [Art] Be stricter about matching filenames when looking for art. [#155](https://github.com/thephpleague/climate/issues/155)
19+
* [Support] Provide better support for Windows using GitHub actions.
20+
21+
--------
22+
423
## 3.5.0 - 2019-02-10
524

625
### Added

‎vendor/league/climate/Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ARG PHP_VERSION=7.1
2+
FROM php:${PHP_VERSION}-cli
3+
4+
ARG COVERAGE
5+
RUN if [ "$COVERAGE" = "pcov" ]; then pecl install pcov && docker-php-ext-enable pcov; fi
6+
7+
# Install composer to manage PHP dependencies
8+
RUN apt-get update && apt-get install -y git zip
9+
RUN curl https://getcomposer.org/download/1.9.0/composer.phar -o /usr/local/sbin/composer
10+
RUN chmod +x /usr/local/sbin/composer
11+
RUN composer self-update
12+
13+
WORKDIR /app

‎vendor/league/climate/composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"require-dev": {
2525
"phpunit/phpunit": "^5.7.16",
2626
"mockery/mockery": "^1.0",
27-
"mikey179/vfsStream": "^1.4"
27+
"mikey179/vfsstream": "^1.4"
2828
},
2929
"suggest": {
3030
"ext-mbstring": "If ext-mbstring is not available you MUST install symfony/polyfill-mbstring"
@@ -40,6 +40,9 @@
4040
}
4141
},
4242
"scripts": {
43-
"test": "phpunit"
43+
"test": [
44+
"vendor/bin/phpunit",
45+
"@composer validate --strict"
46+
]
4447
}
4548
}

‎vendor/league/climate/src/ASCII/php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
__
2+
____ / /_ ____
3+
/ __ \/ __ \/ __ \
4+
/ /_/ / / / / /_/ /
5+
/ .___/_/ /_/ .___/
6+
/_/ /_/

‎vendor/league/climate/src/TerminalObject/Basic/Draw.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Draw extends BasicTerminalObject
1111
public function __construct($art)
1212
{
1313
// Add the default art directory
14-
$this->addDir(__DIR__ . '/../../ASCII');
14+
$this->addDir(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'ASCII');
1515

1616
$this->art = $art;
1717
}

‎vendor/league/climate/src/TerminalObject/Dynamic/Animation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Animation extends DynamicTerminalObject
2323
public function __construct($art, Sleeper $sleeper = null, Keyframe $keyframes = null)
2424
{
2525
// Add the default art directory
26-
$this->addDir(__DIR__ . '/../../ASCII');
26+
$this->addDir(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'ASCII');
2727

2828
$this->setSleeper($sleeper);
2929
$this->setKeyFrames($keyframes);

‎vendor/league/climate/src/TerminalObject/Dynamic/Checkbox/Checkbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ protected function buildCheckboxString()
173173
*/
174174
protected function getPaddingString($line)
175175
{
176-
$length = $this->util->system->width() - $this->lengthWithoutTags($line);
176+
$length = $this->util->width() - $this->lengthWithoutTags($line);
177177

178178
return str_repeat(' ', $length);
179179
}

‎vendor/league/climate/src/TerminalObject/Helper/Art.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
use League\CLImate\Exceptions\UnexpectedValueException;
66

7+
use function preg_quote;
8+
79
trait Art
810
{
911
/**
@@ -58,7 +60,7 @@ protected function addDir($dir)
5860
{
5961
// Add any additional directories to the top of the array
6062
// so that the user can override art
61-
array_unshift($this->art_dirs, rtrim($dir, '/'));
63+
array_unshift($this->art_dirs, rtrim($dir, \DIRECTORY_SEPARATOR));
6264

6365
// Keep the array clean
6466
$this->art_dirs = array_unique($this->art_dirs);
@@ -75,7 +77,7 @@ protected function addDir($dir)
7577
*/
7678
protected function artDir($art)
7779
{
78-
return $this->fileSearch($art, '/*.*');
80+
return $this->fileSearch($art, preg_quote(\DIRECTORY_SEPARATOR) . '*.*');
7981
}
8082

8183
/**
@@ -87,10 +89,10 @@ protected function artDir($art)
8789
*/
8890
protected function artFile($art)
8991
{
90-
$files = $this->fileSearch($art, '[^' . \DIRECTORY_SEPARATOR . ']*$');
92+
$files = $this->fileSearch($art, '(\.[^' . preg_quote(\DIRECTORY_SEPARATOR) . ']*)?$');
9193

9294
if (count($files) === 0) {
93-
$this->addDir(__DIR__ . '/../../ASCII');
95+
$this->addDir(__DIR__ . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . '..' . \DIRECTORY_SEPARATOR . 'ASCII');
9496
$files = $this->fileSearch($this->default_art, '.*');
9597
}
9698

‎vendor/paquettg/php-html-parser/.gitattributes

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
/tests export-ignore
2-
/.scrutinizar.yml export-ignore
3-
/.travis.yml export-ignore
4-
/.gitignore export-ignore
5-
/CHANGELOG.md export-ignore
6-
/CONTRIBUTING.md export-ignore
7-
/LICENSE.md export-ignore
8-
/README.md export-ignore
9-
/phpunit.php export-ignore
10-
/phpunit.xml export-ignore
1+
/tests export-ignore
2+
/.scrutinizar.yml export-ignore
3+
/.travis.yml export-ignore
4+
/.gitignore export-ignore
5+
/CHANGELOG.md export-ignore
6+
/CONTRIBUTING.md export-ignore
7+
/LICENSE.md export-ignore
8+
/README.md export-ignore
9+
/phpunit.php export-ignore
10+
/phpunit.xml export-ignore
11+
/infection.json.dist export-ignore
12+
/.phan export-ignore

0 commit comments

Comments
 (0)