Skip to content

Commit 2759aee

Browse files
mikaelcommikaelcom
committed
Merge branch 'release/3.0.0'
2 parents 3acde5c + c9fa7ab commit 2759aee

30 files changed

+701
-747
lines changed

‎.docker/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
FROM splitbrain/phpfarm:jessie
22

3+
RUN apt-get update && apt-get install -y git zip
4+
35
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
46
COPY . /var/www/
57

6-
WORKDIR /var/www/
8+
WORKDIR /var/www/

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
vendor/
1+
vendor
22
composer.lock
33
phpunit.xml
4-
4+
.phpunit.result.cache

‎.php_cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
$finder = PhpCsFixer\Finder::create()
44
->exclude('vendor')
5-
->exclude('tests')
65
->in(__DIR__);
76

87
return PhpCsFixer\Config::create()

‎.travis.yml‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
11
language: php
22

3-
sudo: false
4-
5-
matrix:
3+
jobs:
64
include:
7-
- php: 5.4
8-
dist: trusty
9-
- php: 5.5
10-
dist: trusty
11-
- php: 5.6
12-
dist: trusty
13-
- php: 7.0
14-
- php: 7.1
15-
- php: 7.2
16-
- php: 7.3
17-
- php: 7.4
5+
- name: 'Tests under PHP 7.4'
6+
php: '7.4'
7+
dist: bionic
8+
- name: 'Tests under PHP 8.0'
9+
php: '8.0'
10+
dist: bionic
11+
- name: 'Tests under PHP nightly'
12+
php: 'nightly'
13+
dist: bionic
14+
15+
fast_finish: true
16+
allow_failures:
17+
- php: 'nightly'
18+
19+
cache:
20+
directories:
21+
- $HOME/.composer/cache
1822

1923
install:
20-
- composer install
24+
- composer install
2125

2226
script:
23-
- ./vendor/phpunit/phpunit/phpunit --coverage-text --coverage-clover=coverage.clover
27+
- php -dmemory_limit=-1 -dxdebug.mode=coverage ./vendor/phpunit/phpunit/phpunit --coverage-text --coverage-clover=coverage.clover
2428

2529
after_script:
26-
- wget https://scrutinizer-ci.com/ocular.phar
27-
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
30+
- wget https://scrutinizer-ci.com/ocular.phar
31+
- php -dmemory_limit=-1 ocular.phar code-coverage:upload --format=php-clover coverage.clover
2832

33+
after_success:
34+
- bash <(curl -s https://codecov.io/bash)

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# CHANGELOG
22

3+
## 3.0.0 - 2021-01-28
4+
- Issue #32 - Migrate to PHp >= 7.4
5+
- use `splitbrain/phpfarm:jessie` as Docker image and fix docker image settings
6+
- Code requires PHP >= 7.4
7+
- Code cleaning
8+
- BC:
9+
- `WsdlToPhp\PackageBase\Utils::getFormatedXml` has been renamed to `WsdlToPhp\PackageBase\Utils::getFormattedXml`
10+
- `WsdlToPhp\PackageBase\AbstractSoapClientBase::getFormatedXml` has been renamed to `WsdlToPhp\PackageBase\AbstractSoapClientBase::getFormattedXml`
11+
- Update READMEs
12+
- Update Travis CI settings
13+
- Update PHPUnit settings
14+
- Update LICENSE file
15+
- Version 1.0 is no more maintained
16+
317
## 2.2.0 - 2020-09-11
418
- Issue #31 - Add output headers to SoapClient in order to be able to store them
519

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-2015 Mikaël DELSOL
1+
Copyright (c) 2012-2021 Mikaël DELSOL
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
> Classes that are used by the classes generated by the [PackageGenerator](https://github.com/WsdlToPhp/PackageGenerator) project to ease the SoapClient UX.
44
5+
[![License](https://poser.pugx.org/wsdltophp/packagebase/license)](https://packagist.org/packages/wsdltophp/packagebase)
56
[![Latest Stable Version](https://poser.pugx.org/wsdltophp/packagebase/version.png)](https://packagist.org/packages/wsdltophp/packagebase)
6-
[![Total Downloads](https://poser.pugx.org/wsdltophp/packagebase/downloads)](https://packagist.org/packages/wsdltophp/packagebase)
77
[![Build Status](https://api.travis-ci.org/WsdlToPhp/PackageBase.svg)](https://travis-ci.org/WsdlToPhp/PackageBase)
88
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/badges/quality-score.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/)
99
[![Code Coverage](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/badges/coverage.png)](https://scrutinizer-ci.com/g/WsdlToPhp/PackageBase/)
10+
[![Total Downloads](https://poser.pugx.org/wsdltophp/packagebase/downloads)](https://packagist.org/packages/wsdltophp/packagebase)
1011
[![StyleCI](https://styleci.io/repos/38760239/shield)](https://styleci.io/repos/38760239)
1112
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/bfbc0c8f-5793-489b-8151-36ea149ec98d/mini.png)](https://insight.sensiolabs.com/projects/bfbc0c8f-5793-489b-8151-36ea149ec98d)
1213

@@ -315,13 +316,7 @@ $ composer test
315316

316317
## Testing using [Docker](https://www.docker.com/)
317318
Thanks to the [Docker image](https://hub.docker.com/r/splitbrain/phpfarm) of [phpfarm](https://github.com/fpoirotte/phpfarm), tests can be run locally under *any* PHP version using the cli:
318-
- php-5.4
319-
- php-5.5
320-
- php-5.6
321-
- php-7.0
322-
- php-7.1
323-
- php-7.2
324-
- php-7.3
319+
- php-7.4
325320

326321
First of all, you need to create your container which you can do using [docker-compose](https://docs.docker.com/compose/) by running the below command line from the root directory of the project:
327322
```bash
@@ -331,7 +326,15 @@ $ docker-compose up -d --build
331326
You then have a container named `package_base` in which you can run `composer` commands and `php cli` commands such as:
332327
```bash
333328
# install deps in container (using update ensure it does use the composer.lock file if there is any)
334-
$ docker exec -it package_base php-7.2 /usr/bin/composer update
329+
$ docker exec -it package_base php-7.4 /usr/bin/composer update
335330
# run tests in container
336-
$ docker exec -it package_base php-7.2 -dmemory_limit=-1 vendor/bin/phpunit
331+
$ docker exec -it package_base php-7.4 -dmemory_limit=-1 vendor/bin/phpunit
337332
```
333+
334+
## FAQ
335+
336+
If you have a question, feel free to [create an issue](https://github.com/WsdlToPhp/PackageBase/issues/new).
337+
338+
## License
339+
340+
The MIT License (MIT). Please see [License File](LICENSE) for more information.

‎UPGRADE-3.0.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# UPGRADE FROM 2.0 to 3.0
2+
3+
The main change, apart from requiring PHP >= 7.4, is that `Utils` and `AbstractSoapClientBase` method `getFormatedXml` has been renamed to `getFormattedXml` (typo fix).
4+
5+
**Previously**:
6+
```php
7+
WsdlToPhp\PackageBase\Utils::getFormatedXml($xmlString);
8+
WsdlToPhp\PackageBase\AbstractSoapClientBase::getFormatedXml($xmlString);
9+
```
10+
11+
**Now**:
12+
```php
13+
WsdlToPhp\PackageBase\Utils::getFormattedXml($xmlString);
14+
WsdlToPhp\PackageBase\AbstractSoapClientBase::getFormattedXml($xmlString);
15+
```

‎composer.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,18 @@
4545
"email" : "[email protected]"
4646
},
4747
"require": {
48-
"php" : ">=5.4",
49-
"ext-soap": "*"
48+
"php" : ">=7.4",
49+
"ext-soap": "*",
50+
"ext-dom": "*",
51+
"ext-json": "*"
5052
},
5153
"scripts": {
5254
"test": "vendor/bin/phpunit",
5355
"lint": "vendor/bin/php-cs-fixer fix --ansi --diff --verbose"
5456
},
5557
"require-dev": {
5658
"friendsofphp/php-cs-fixer": "~2.0",
57-
"phpunit/phpunit": "^4.8 || ^6.0"
59+
"phpunit/phpunit": "^9"
5860
},
5961
"autoload": {
6062
"psr-4": {

‎phpunit.xml.dist‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
5-
backupGlobals="false"
6-
colors="true"
7-
bootstrap="vendor/autoload.php">
8-
<php>
9-
<ini name="error_reporting" value="-1" />
10-
</php>
11-
12-
<testsuite name="Test Suite">
13-
<directory>./tests/</directory>
14-
</testsuite>
15-
16-
<filter>
17-
<whitelist>
18-
<directory>./</directory>
19-
<exclude>
20-
<directory>./tests</directory>
21-
<directory>./vendor</directory>
22-
</exclude>
23-
</whitelist>
24-
</filter>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php">
3+
<coverage>
4+
<include>
5+
<directory>./</directory>
6+
</include>
7+
<exclude>
8+
<directory>./tests</directory>
9+
<directory>./vendor</directory>
10+
</exclude>
11+
</coverage>
12+
<php>
13+
<ini name="error_reporting" value="-1"/>
14+
</php>
15+
<testsuite name="Test Suite">
16+
<directory>./tests/</directory>
17+
</testsuite>
2518
</phpunit>
26-

0 commit comments

Comments
 (0)