Skip to content

Commit 44ab612

Browse files
cblanqueracblanquera
committed
updated components to 8.2. Fixed type errors and deprecation notices 12h
1 parent 4b1da6b commit 44ab612

File tree

92 files changed

+224
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+224
-236
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.phpunit.cache
12
.phpunit.result.cache
23
/vendor/
34
composer.lock

‎composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"name": "phpugph/components",
33
"type": "library",
4-
"description": "Common PHP8 Patterns and Constructs",
4+
"description": "Common PHP8.2 Patterns and Constructs",
55
"keywords": [
66
"library",
7-
"php81"
7+
"php82"
88
],
99
"license": "MIT",
1010
"require-dev": {
11-
"php-coveralls/php-coveralls": "2.5.2",
12-
"phpunit/phpunit": "9.5.21",
13-
"squizlabs/php_codesniffer": "3.7.1"
11+
"php-coveralls/php-coveralls": "2.6.0",
12+
"phpunit/phpunit": "10.3.3",
13+
"squizlabs/php_codesniffer": "3.7.2"
1414
},
1515
"require": {
16-
"php": ">=8.1"
16+
"php": ">=8.2"
1717
},
1818
"autoload": {
1919
"psr-4": {

‎phpunit.xml‎

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,126 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
bootstrap="test/bootstrap.php"
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
backupGlobals="false"
5+
colors="true"
6+
processIsolation="false"
7+
stopOnFailure="false"
8+
bootstrap="test/bootstrap.php"
9+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
10+
cacheDirectory=".phpunit.cache"
11+
backupStaticProperties="false"
1212
>
1313
<testsuites>
1414
<testsuite name="Helper Test Suite">
15-
<file>test/Helper/BinderTrait.php</file>
16-
<file>test/Helper/ConditionalTrait.php</file>
17-
<file>test/Helper/InstanceTrait.php</file>
18-
<file>test/Helper/LoopTrait.php</file>
19-
<file>test/Helper/SingletonTrait.php</file>
15+
<file>test/Helper/BinderTraitTest.php</file>
16+
<file>test/Helper/ConditionalTraitTest.php</file>
17+
<file>test/Helper/InstanceTraitTest.php</file>
18+
<file>test/Helper/LoopTraitTest.php</file>
19+
<file>test/Helper/SingletonTraitTest.php</file>
2020
</testsuite>
2121
<testsuite name="Resolver Test Suite">
22-
<file>test/Resolver/ResolverException.php</file>
23-
<file>test/Resolver/ResolverHandler.php</file>
24-
<file>test/Resolver/ResolverTrait.php</file>
25-
<file>test/Resolver/StateTrait.php</file>
22+
<file>test/Resolver/ResolverExceptionTest.php</file>
23+
<file>test/Resolver/ResolverHandlerTest.php</file>
24+
<file>test/Resolver/ResolverTraitTest.php</file>
25+
<file>test/Resolver/StateTraitTest.php</file>
2626
</testsuite>
2727
<testsuite name="Profiler Test Suite">
28-
<file>test/Profiler/CallerTrait.php</file>
29-
<file>test/Profiler/InspectorHandler.php</file>
30-
<file>test/Profiler/InspectorTrait.php</file>
31-
<file>test/Profiler/LoggerTrait.php</file>
28+
<file>test/Profiler/CallerTraitTest.php</file>
29+
<file>test/Profiler/InspectorHandlerTest.php</file>
30+
<file>test/Profiler/InspectorTraitTest.php</file>
31+
<file>test/Profiler/LoggerTraitTest.php</file>
3232
</testsuite>
3333
<testsuite name="Event Test Suite">
34-
<file>test/Event/EventEmitter.php</file>
35-
<file>test/Event/EventObserver.php</file>
36-
<file>test/Event/EventTrait.php</file>
34+
<file>test/Event/EventEmitterTest.php</file>
35+
<file>test/Event/EventObserverTest.php</file>
36+
<file>test/Event/EventTraitTest.php</file>
3737
</testsuite>
3838
<testsuite name="Data Test Suite">
39-
<file>test/Data/ArrayAccessTrait.php</file>
40-
<file>test/Data/Collection.php</file>
41-
<file>test/Data/CountableTrait.php</file>
42-
<file>test/Data/DataException.php</file>
43-
<file>test/Data/DataTrait.php</file>
44-
<file>test/Data/DotTrait.php</file>
45-
<file>test/Data/GeneratorTrait.php</file>
46-
<file>test/Data/CloneTrait.php</file>
47-
<file>test/Data/IteratorTrait.php</file>
48-
<file>test/Data/MagicTrait.php</file>
49-
<file>test/Data/Model.php</file>
50-
<file>test/Data/Registry.php</file>
39+
<file>test/Data/ArrayAccessTraitTest.php</file>
40+
<file>test/Data/CollectionTest.php</file>
41+
<file>test/Data/CountableTraitTest.php</file>
42+
<file>test/Data/DataExceptionTest.php</file>
43+
<file>test/Data/DataTraitTest.php</file>
44+
<file>test/Data/DotTraitTest.php</file>
45+
<file>test/Data/GeneratorTraitTest.php</file>
46+
<file>test/Data/CloneTraitTest.php</file>
47+
<file>test/Data/IteratorTraitTest.php</file>
48+
<file>test/Data/MagicTraitTest.php</file>
49+
<file>test/Data/ModelTest.php</file>
50+
<file>test/Data/RegistryTest.php</file>
5151
</testsuite>
5252
<testsuite name="I18n Test Suite">
53-
<file>test/I18n/Language.php</file>
54-
<file>test/I18n/LanguageException.php</file>
55-
<file>test/I18n/Timezone.php</file>
56-
<file>test/I18n/TimezoneValidation.php</file>
53+
<file>test/I18n/LanguageTest.php</file>
54+
<file>test/I18n/LanguageExceptionTest.php</file>
55+
<file>test/I18n/TimezoneTest.php</file>
56+
<file>test/I18n/TimezoneValidationTest.php</file>
5757
</testsuite>
5858
<testsuite name="IO Test Suite">
59-
<file>test/IO/IOHandler.php</file>
60-
<file>test/IO/Middleware.php</file>
61-
<file>test/IO/Request.php</file>
62-
<file>test/IO/Response.php</file>
63-
<file>test/IO/Middleware/ErrorProcessorTrait.php</file>
64-
<file>test/IO/Middleware/PostProcessorTrait.php</file>
65-
<file>test/IO/Middleware/PreProcessorTrait.php</file>
66-
<file>test/IO/Request/CliTrait.php</file>
67-
<file>test/IO/Request/ContentTrait.php</file>
68-
<file>test/IO/Request/CookieTrait.php</file>
69-
<file>test/IO/Request/FileTrait.php</file>
70-
<file>test/IO/Request/GetTrait.php</file>
71-
<file>test/IO/Request/PostTrait.php</file>
72-
<file>test/IO/Request/RequestTrait.php</file>
73-
<file>test/IO/Request/RouteTrait.php</file>
74-
<file>test/IO/Request/ServerTrait.php</file>
75-
<file>test/IO/Request/SessionTrait.php</file>
76-
<file>test/IO/Request/StageTrait.php</file>
77-
<file>test/IO/Response/ContentTrait.php</file>
78-
<file>test/IO/Response/HeaderTrait.php</file>
79-
<file>test/IO/Response/ResponseTrait.php</file>
80-
<file>test/IO/Response/RestTrait.php</file>
81-
<file>test/IO/Response/StatusTrait.php</file>
59+
<file>test/IO/IOHandlerTest.php</file>
60+
<file>test/IO/MiddlewareTest.php</file>
61+
<file>test/IO/RequestTest.php</file>
62+
<file>test/IO/ResponseTest.php</file>
63+
<file>test/IO/Middleware/ErrorProcessorTraitTest.php</file>
64+
<file>test/IO/Middleware/PostProcessorTraitTest.php</file>
65+
<file>test/IO/Middleware/PreProcessorTraitTest.php</file>
66+
<file>test/IO/Request/CliTraitTest.php</file>
67+
<file>test/IO/Request/ContentTraitTest.php</file>
68+
<file>test/IO/Request/CookieTraitTest.php</file>
69+
<file>test/IO/Request/FileTraitTest.php</file>
70+
<file>test/IO/Request/GetTraitTest.php</file>
71+
<file>test/IO/Request/PostTraitTest.php</file>
72+
<file>test/IO/Request/RequestTraitTest.php</file>
73+
<file>test/IO/Request/RouteTraitTest.php</file>
74+
<file>test/IO/Request/ServerTraitTest.php</file>
75+
<file>test/IO/Request/SessionTraitTest.php</file>
76+
<file>test/IO/Request/StageTraitTest.php</file>
77+
<file>test/IO/Response/ContentTraitTest.php</file>
78+
<file>test/IO/Response/HeaderTraitTest.php</file>
79+
<file>test/IO/Response/ResponseTraitTest.php</file>
80+
<file>test/IO/Response/RestTraitTest.php</file>
81+
<file>test/IO/Response/StatusTraitTest.php</file>
8282
</testsuite>
8383
<testsuite name="Http Test Suite">
84-
<file>test/Http/HttpDispatcher.php</file>
85-
<file>test/Http/HttpException.php</file>
86-
<file>test/Http/HttpHandler.php</file>
87-
<file>test/Http/Router.php</file>
88-
<file>test/Http/Dispatcher/DispatcherTrait.php</file>
89-
<file>test/Http/Router/RouterTrait.php</file>
84+
<file>test/Http/HttpDispatcherTest.php</file>
85+
<file>test/Http/HttpExceptionTest.php</file>
86+
<file>test/Http/HttpHandlerTest.php</file>
87+
<file>test/Http/RouterTest.php</file>
88+
<file>test/Http/Dispatcher/DispatcherTraitTest.php</file>
89+
<file>test/Http/Router/RouterTraitTest.php</file>
9090
</testsuite>
9191
<testsuite name="Terminal Test Suite">
92-
<file>test/Terminal/TerminalException.php</file>
93-
<file>test/Terminal/TerminalHelper.php</file>
94-
<file>test/Terminal/TerminalHandler.php</file>
92+
<file>test/Terminal/TerminalExceptionTest.php</file>
93+
<file>test/Terminal/TerminalHelperTest.php</file>
94+
<file>test/Terminal/TerminalHandlerTest.php</file>
9595
</testsuite>
9696
<testsuite name="Package Test Suite">
97-
<file>test/Package/PackageException.php</file>
98-
<file>test/Package/Package.php</file>
99-
<file>test/Package/PackageTrait.php</file>
100-
<file>test/Package/PackageHandler.php</file>
97+
<file>test/Package/PackageExceptionTest.php</file>
98+
<file>test/Package/PackageTest.php</file>
99+
<file>test/Package/PackageTraitTest.php</file>
100+
<file>test/Package/PackageHandlerTest.php</file>
101101
</testsuite>
102102
<testsuite name="Curl Test Suite">
103-
<file>test/Curl/CurlHandler.php</file>
104-
<file>test/Curl/Rest.php</file>
103+
<file>test/Curl/CurlHandlerTest.php</file>
104+
<file>test/Curl/RestTest.php</file>
105105
</testsuite>
106106
<testsuite name="Image Test Suite">
107-
<file>test/Image/ImageHandler.php</file>
108-
<file>test/Image/ImageException.php</file>
107+
<file>test/Image/ImageHandlerTest.php</file>
108+
<file>test/Image/ImageExceptionTest.php</file>
109109
</testsuite>
110110
<testsuite name="Async Test Suite">
111-
<file>test/Async/AsyncException.php</file>
112-
<file>test/Async/Coroutine.php</file>
113-
<file>test/Async/AsyncHandler.php</file>
114-
<file>test/Async/Promise.php</file>
115-
<file>test/Async/AsyncTrait.php</file>
111+
<file>test/Async/AsyncExceptionTest.php</file>
112+
<file>test/Async/CoroutineTest.php</file>
113+
<file>test/Async/AsyncHandlerTest.php</file>
114+
<file>test/Async/PromiseTest.php</file>
115+
<file>test/Async/AsyncTraitTest.php</file>
116116
</testsuite>
117117
<testsuite name="OAuth Test Suite">
118-
<file>test/OAuth/OAuth1.php</file>
119-
<file>test/OAuth/OAuth2.php</file>
118+
<file>test/OAuth/OAuth1Test.php</file>
119+
<file>test/OAuth/OAuth2Test.php</file>
120120
</testsuite>
121121
</testsuites>
122-
123-
<coverage processUncoveredFiles="false" pathCoverage="true">
122+
<coverage pathCoverage="true"/>
123+
<source>
124124
<include>
125125
<directory suffix=".php">./src</directory>
126126
</include>
@@ -152,5 +152,5 @@
152152
<file>src/Async/map/socket.php</file>
153153
<file>src/Terminal/map.php</file>
154154
</exclude>
155-
</coverage>
155+
</source>
156156
</phpunit>

‎src/Async/Promise.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ public function __construct(callable $executor, QueueInterface $handler = null)
7979
//set the queue
8080
$this->queue = new SplQueue();
8181

82-
//set the catcher
83-
$this->catcher = include sprintf('%s/map/noop.php', __DIR__);
84-
8582
//determine the handler
8683
// @codeCoverageIgnoreStart
8784
if (is_null($handler)) {

‎src/Curl/CurlHandler.php‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -480,25 +480,6 @@ public function setHeaders($key, $value = null)
480480
return $this;
481481
}
482482

483-
/**
484-
* Sets url parameter
485-
*
486-
* @param *array|string $key The parameter name
487-
* @param scalar $value The parameter value
488-
*
489-
* @return CurlHandler
490-
*/
491-
public function setUrlParameter($key, $value = null)
492-
{
493-
if (is_array($key)) {
494-
$this->param = $key;
495-
return $this;
496-
}
497-
498-
$this->param[$key] = $value;
499-
return $this;
500-
}
501-
502483
/**
503484
* Sets CURLOPT_SSL_VERIFYHOST
504485
*

‎src/Data/Model.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ class Model implements ArrayAccess, Iterator, Countable, ModelInterface
5252
DataTrait::__toStringData as __toString;
5353
}
5454

55+
/**
56+
* @var array $data The data collection
57+
*/
58+
protected $data = [];
59+
5560
/**
5661
* Attempts to use __callData then __callResolver
5762
*

‎src/Data/Registry.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ class Registry implements ArrayAccess, Iterator, Countable, RegistryInterface
5252
DataTrait::__toStringData as __toString;
5353
}
5454

55+
/**
56+
* @var array $data The data collection
57+
*/
58+
protected $data = [];
59+
5560
/**
5661
* Attempts to use __callData then __callResolver
5762
*

‎src/IO/AbstractIO.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ abstract class AbstractIO extends Registry
2727
*/
2828
public function __get(string $name)
2929
{
30-
if (isset($this->$name)) {
31-
return $this->$name;
30+
if (isset($this[$name])) {
31+
return $this[$name];
3232
}
3333

3434
return null;
@@ -42,7 +42,7 @@ public function __get(string $name)
4242
*/
4343
public function __set(string $name, $value)
4444
{
45-
$this->$name = $value;
45+
$this[$name] = $value;
4646
}
4747

4848
/**

‎src/Image/ImageHandler.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,22 @@ class ImageHandler
2929
/**
3030
* @var int $width The width of the image for meta
3131
*/
32-
protected $width = 0;
32+
protected int $width = 0;
3333

3434
/**
3535
* @var int $height The height of the image for meta
3636
*/
37-
protected $height = 0;
37+
protected int $height = 0;
38+
39+
/**
40+
* @var int $quality The quality of the image
41+
*/
42+
protected int $quality = 0;
43+
44+
/**
45+
* @var string $type of image (png, jpg, gif, etc)
46+
*/
47+
protected string $type;
3848

3949
/**
4050
* Pre set the image data

test/Async/AsyncException.php renamed to test/Async/AsyncExceptionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use PHPUnit\Framework\TestCase;
1212

13-
class Async_AsyncException_Test extends TestCase
13+
class AsyncExceptionTest extends TestCase
1414
{
1515
/**
1616
* @var HttpException

0 commit comments

Comments
 (0)