Skip to content

Commit 5baff8b

Browse files
authored
PHP 8.1 (#829)
* php 8.1 * skautis lib update * skautis library version * update nette skautis * update skautis library * namespace fix * skautis lib update * namespace fix Co-authored-by: Jan Staněk <[email protected]>
1 parent 475559f commit 5baff8b

14 files changed

+254
-173
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: "Create release package"
1010
runs-on: ubuntu-20.04
1111
container:
12-
image: skaut/lebeda:8.0
12+
image: skaut/lebeda:8.1
1313
steps:
1414
- uses: actions/checkout@v2
1515
# Copy & paste from https://github.com/actions/cache/blob/master/examples.md#php---composer

.github/workflows/test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: "Build"
1616
runs-on: ubuntu-20.04
1717
container:
18-
image: skaut/lebeda:8.0
18+
image: skaut/lebeda:8.1
1919
steps:
2020
- uses: actions/checkout@v2
2121
# Copy & paste from https://github.com/actions/cache/blob/master/examples.md#php---composer
@@ -46,7 +46,7 @@ jobs:
4646
name: "Unit tests"
4747
runs-on: ubuntu-20.04
4848
container:
49-
image: skaut/lebeda:8.0
49+
image: skaut/lebeda:8.1
5050
needs: workdir
5151
steps:
5252
- name: Download workdir
@@ -102,7 +102,7 @@ jobs:
102102
name: "PHPStan analysis"
103103
runs-on: ubuntu-20.04
104104
container:
105-
image: skaut/lebeda:8.0
105+
image: skaut/lebeda:8.1
106106
needs: workdir
107107
steps:
108108
- name: Download workdir
@@ -118,7 +118,7 @@ jobs:
118118
name: "Coding standard"
119119
runs-on: ubuntu-20.04
120120
container:
121-
image: skaut/lebeda:8.0
121+
image: skaut/lebeda:8.1
122122
needs: workdir
123123
steps:
124124
- name: Download workdir
@@ -134,7 +134,7 @@ jobs:
134134
name: "Doctrine checks"
135135
runs-on: ubuntu-20.04
136136
container:
137-
image: skaut/lebeda:8.0
137+
image: skaut/lebeda:8.1
138138
services:
139139
mysql-test:
140140
image: mysql:8.0

app/InstallModule/Presenters/InstallPresenter.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
use Exception;
2222
use Nette\Application\AbortException;
2323
use Nette\DI\Attributes\Inject;
24-
use Skautis\Skautis;
25-
use Skautis\Wsdl\WsdlException;
24+
use Skaut\Skautis\Skautis;
25+
use Skaut\Skautis\Wsdl\WsdlException;
2626
use Symfony\Component\Console\Input\ArrayInput;
2727
use Symfony\Component\Messenger\Exception\HandlerFailedException;
2828
use Throwable;

app/Services/SkautIsEventEducationService.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
use App\Model\Structure\Repositories\SubeventRepository;
99
use App\Model\User\User;
1010
use Doctrine\Common\Collections\Collection;
11-
use Skautis\Skautis;
12-
use Skautis\Wsdl\WsdlException;
11+
use Skaut\Skautis\Skautis;
12+
use Skaut\Skautis\Wsdl\WsdlException;
1313
use stdClass;
1414
use Tracy\Debugger;
1515
use Tracy\ILogger;

app/Services/SkautIsEventGeneralService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use App\Model\User\User;
88
use Doctrine\Common\Collections\Collection;
9-
use Skautis\Wsdl\WsdlException;
9+
use Skaut\Skautis\Wsdl\WsdlException;
1010
use stdClass;
1111
use Tracy\Debugger;
1212
use Tracy\ILogger;

app/Services/SkautIsEventService.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use App\Model\User\User;
88
use Doctrine\Common\Collections\Collection;
99
use Nette;
10-
use Skautis\Skautis;
11-
use Skautis\Wsdl\WsdlException;
10+
use Skaut\Skautis\Skautis;
11+
use Skaut\Skautis\Wsdl\WsdlException;
1212
use stdClass;
1313
use Tracy\Debugger;
1414
use Tracy\ILogger;

app/Services/SkautIsService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Nette;
99
use Nette\Caching\Cache;
1010
use Nette\Caching\Storage;
11-
use Skautis\Skautis;
11+
use Skaut\Skautis\Skautis;
1212
use stdClass;
1313
use Throwable;
1414

app/WebModule/Forms/ApplicationFormFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
use Nette\Localization\Translator;
5151
use Nextras\FormComponents\Controls\DateControl;
5252
use Nextras\FormComponents\Controls\DateTimeControl;
53-
use Skautis\Wsdl\WsdlException;
53+
use Skaut\Skautis\Wsdl\WsdlException;
5454
use stdClass;
5555
use Throwable;
5656
use Tracy\Debugger;

app/WebModule/Forms/PersonalDetailsFormFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Nette;
1313
use Nette\Application\UI\Form;
1414
use Nextras\FormComponents\Controls\DateControl;
15-
use Skautis\Wsdl\WsdlException;
15+
use Skaut\Skautis\Wsdl\WsdlException;
1616
use stdClass;
1717
use Tracy\Debugger;
1818
use Tracy\ILogger;

code-quality/SkautisAliasesExtension.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use PHPStan\Reflection\PropertiesClassReflectionExtension;
66
use PHPStan\Reflection\PropertyReflection;
77
use PHPStan\Type\ObjectType;
8-
use Skautis\Skautis;
9-
use Skautis\Wsdl\WebServiceInterface;
8+
use Skaut\Skautis\Skautis;
9+
use Skaut\Skautis\Wsdl\WebServiceInterface;
1010

1111
class SkautisAliasesExtension implements PropertiesClassReflectionExtension
1212
{

code-quality/SkautisWebserviceMagicMethodsExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use PHPStan\Reflection\Dummy\DummyMethodReflection;
77
use PHPStan\Reflection\MethodReflection;
88
use PHPStan\Reflection\MethodsClassReflectionExtension;
9-
use Skautis\Wsdl\WebServiceInterface;
9+
use Skaut\Skautis\Wsdl\WebServiceInterface;
1010

1111
class SkautisWebserviceMagicMethodsExtension implements MethodsClassReflectionExtension
1212
{

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010

1111
"require": {
12-
"php": ">=8.0",
12+
"php": ">=8.1",
1313
"ext-bcmath": "*",
1414
"ext-fileinfo": "*",
1515
"ext-iconv": "*",
@@ -59,8 +59,8 @@
5959
"eluceo/ical": "^2.5",
6060
"endroid/qr-code": "^4.0",
6161

62-
"skautis/skautis": "^2.2",
63-
"skautis/nette": "^2.2",
62+
"skautis/skautis": "3.0.0-alpha.5",
63+
"skautis/nette": "3.0.0-alpha.3",
6464

6565
"pear/numbers_words": "^0.18",
6666
"azuyalabs/yasumi": "^2.5",

0 commit comments

Comments
 (0)