Skip to content

Commit d32b158

Browse files
committed
Update php-typed-array to 4.0
1 parent 53d3a94 commit d32b158

File tree

9 files changed

+21
-16
lines changed

9 files changed

+21
-16
lines changed

bin/ci/phpstan.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Process\Process,
88
Process\ProcessArray
99
};
10-
use steevanb\PhpTypedArray\ScalarArray\StringArray;
10+
use Steevanb\PhpTypedArray\ScalarArray\StringArray;
1111
use Symfony\Component\Console\Input\ArgvInput;
1212

1313
require $_SERVER['COMPOSER_HOME'] . '/vendor/autoload.php';

bin/ci/phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Process\Process,
88
Process\ProcessArray
99
};
10-
use steevanb\PhpTypedArray\ScalarArray\StringArray;
10+
use Steevanb\PhpTypedArray\ScalarArray\StringArray;
1111
use Symfony\Component\Console\Input\ArgvInput;
1212

1313
require dirname(__DIR__, 2) . '/vendor/autoload.php';

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"require": {
1313
"php": "^8.1",
1414
"ext-pcntl": "*",
15-
"steevanb/php-typed-array": "^3.2",
15+
"steevanb/php-typed-array": "^4.0",
1616
"symfony/console": "^6.1",
1717
"symfony/process": "^6.1"
1818
},
@@ -28,7 +28,7 @@
2828
},
2929
"autoload-dev": {
3030
"psr-4": {
31-
"steevanb\\PhpTypedArray\\Bridge\\Phpstan\\": "vendor/steevanb/php-typed-array/bridge/Phpstan/src",
31+
"Steevanb\\PhpTypedArray\\Bridge\\Phpstan\\": "vendor/steevanb/php-typed-array/bridge/Phpstan/src",
3232
"Steevanb\\ParallelProcess\\Tests\\": "tests/"
3333
}
3434
},

docker/ci/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ RUN \
3737
php8.1-zip \
3838
# For coverage
3939
php8.1-xdebug \
40+
&& update-alternatives --set php /usr/bin/php8.1 \
41+
4042
# Install CI tools
4143
&& cd ${COMPOSER_HOME} \
42-
&& php8.1 /usr/local/bin/composer update \
44+
&& composer update \
4345
&& ln -s ${COMPOSER_HOME}/vendor/bin/composer-require-checker /usr/local/bin/composer-require-checker \
4446
&& ln -s ${COMPOSER_HOME}/vendor/bin/phpcf /usr/local/bin/phpcf \
4547
&& ln -s ${COMPOSER_HOME}/vendor/bin/phpcs /usr/local/bin/phpcs \
@@ -52,10 +54,8 @@ RUN \
5254
&& chmod 777 ${COMPOSER_HOME}/vendor/infection/extension-installer/src/GeneratedExtensionsConfig.php \
5355

5456
# Install Symfony components
55-
&& COMPOSER_HOME=${COMPOSER_HOME_SYMFONY_6_1} \
56-
php8.1 /usr/local/bin/composer global require symfony/process:6.1.* symfony/console:6.1.* \
57-
&& COMPOSER_HOME=${COMPOSER_HOME_SYMFONY_6_2} \
58-
php8.1 /usr/local/bin/composer global require symfony/process:6.2.* symfony/console:6.2.* \
57+
&& COMPOSER_HOME=${COMPOSER_HOME_SYMFONY_6_1} composer global require symfony/process:6.1.* symfony/console:6.1.* \
58+
&& COMPOSER_HOME=${COMPOSER_HOME_SYMFONY_6_2} composer global require symfony/process:6.2.* symfony/console:6.2.* \
5959

6060
# Purge
6161
&& apt-get purge -y software-properties-common \

src/Console/Application/Theme/DefaultTheme.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Color,
1515
Output\OutputInterface
1616
};
17-
use steevanb\PhpTypedArray\ScalarArray\StringArray;
17+
use Steevanb\PhpTypedArray\ScalarArray\StringArray;
1818

1919
class DefaultTheme implements ThemeInterface
2020
{

src/Console/Output/ConsoleBufferedOutput.php

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

55
namespace Steevanb\ParallelProcess\Console\Output;
66

7-
use steevanb\PhpTypedArray\ScalarArray\StringArray;
7+
use Steevanb\PhpTypedArray\ScalarArray\StringArray;
88
use Symfony\Component\Console\{
99
Formatter\OutputFormatterInterface,
1010
Output\ConsoleOutput,

src/Process/ProcessArray.php

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

55
namespace Steevanb\ParallelProcess\Process;
66

7-
use steevanb\PhpTypedArray\ObjectArray\ObjectArray;
7+
use Steevanb\PhpTypedArray\ObjectArray\ObjectArray;
88

99
class ProcessArray extends ObjectArray
1010
{

src/Process/ProcessFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Steevanb\ParallelProcess\Process;
66

77
use Steevanb\ParallelProcess\Console\Application\ParallelProcessesApplication;
8-
use steevanb\PhpTypedArray\ScalarArray\StringArray;
8+
use Steevanb\PhpTypedArray\ScalarArray\StringArray;
99

1010
class ProcessFactory
1111
{

tests/Process/ProcessArray/ConstructTest.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
Process\Process,
1010
Process\ProcessArray
1111
};
12+
use Steevanb\PhpTypedArray\{
13+
NullValueModeEnum,
14+
ObjectComparisonModeEnum,
15+
ValueAlreadyExistsModeEnum
16+
};
1217

1318
/** @covers \Steevanb\ParallelProcess\Process\ProcessArray::__construct */
1419
final class ConstructTest extends TestCase
@@ -19,8 +24,8 @@ public function testDefaultValues(): void
1924

2025
static::assertCount(0, $processes);
2126
static::assertSame(Process::class, $processes->getClassName());
22-
static::assertSame(ProcessArray::COMPARISON_STRING, $processes->getComparisonMode());
23-
static::assertSame(ProcessArray::VALUE_ALREADY_EXIST_ADD, $processes->getValueAlreadyExistMode());
24-
static::assertSame(ProcessArray::NULL_VALUE_ALLOW, $processes->getNullValueMode());
27+
static::assertSame(ObjectComparisonModeEnum::STRING, $processes->getComparisonMode());
28+
static::assertSame(ValueAlreadyExistsModeEnum::ADD, $processes->getValueAlreadyExistMode());
29+
static::assertSame(NullValueModeEnum::ALLOW, $processes->getNullValueMode());
2530
}
2631
}

0 commit comments

Comments
 (0)