Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update uselagoon/php-8.2-cli Docker tag to v24.9.0 #119

Merged
merged 2 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
phpserver:
image: uselagoon/php-8.2-cli:24.8.0
image: uselagoon/php-8.2-cli:24.9.0
volumes:
- .:/app:delegated
environment:
Expand Down
4 changes: 0 additions & 4 deletions rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
use Rector\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector;
use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector;
use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector;
use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
use Rector\Config\RectorConfig;
use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
Expand All @@ -41,13 +39,11 @@

$rectorConfig->skip([
// Rules added by Rector's rule sets.
ArraySpreadInsteadOfArrayMergeRector::class,
CountArrayToEmptyArrayComparisonRector::class,
DisallowedEmptyRuleFixerRector::class,
InlineArrayReturnAssignRector::class,
NewlineAfterStatementRector::class,
NewlineBeforeNewAssignSetRector::class,
PostIncDecToPreIncDecRector::class,
RemoveAlwaysTrueIfConditionRector::class,
SimplifyEmptyCheckOnEmptyArrayRector::class,
// Dependencies.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function printLastResponseOnError(AfterStepScope $event): void {
* @When save screenshot
* @When I save screenshot
*/
public function iSaveScreenshot(bool $fail = FALSE, string $filename = NULL): void {
public function iSaveScreenshot(bool $fail = FALSE, ?string $filename = NULL): void {
$driver = $this->getSession()->getDriver();
$fileName = $this->makeFileName('html', $filename, $fail);
try {
Expand Down Expand Up @@ -276,7 +276,7 @@ protected function prepareDir(string $dir): void {
*
* @throws \Exception
*/
protected function makeFileName(string $ext, string $filename = NULL, bool $fail = FALSE): string {
protected function makeFileName(string $ext, ?string $filename = NULL, bool $fail = FALSE): string {
if ($fail) {
$filename = $this->filenamePatternFailed;
}
Expand Down
14 changes: 7 additions & 7 deletions src/DrevOps/BehatScreenshotExtension/Tokenizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static function scanTokens(string $text): array {
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public static function replaceFeatureToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
public static function replaceFeatureToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
$replacement = $token;
if (isset($data['feature_file']) && is_string($data['feature_file'])) {
$featureFile = $data['feature_file'];
Expand Down Expand Up @@ -120,7 +120,7 @@ public static function replaceFeatureToken(string $token, string $name, string $
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public static function replaceExtToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
public static function replaceExtToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
$ext = 'html';
if (isset($data['ext']) && is_string($data['ext']) && $data['ext'] !== '') {
$ext = $data['ext'];
Expand Down Expand Up @@ -148,7 +148,7 @@ public static function replaceExtToken(string $token, string $name, string $qual
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public static function replaceStepToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
public static function replaceStepToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
$replacement = $token;
switch ($qualifier) {
case 'line':
Expand Down Expand Up @@ -193,7 +193,7 @@ public static function replaceStepToken(string $token, string $name, string $qua
*
* @throws \Exception
*/
public static function replaceDatetimeToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
public static function replaceDatetimeToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
$timestamp = NULL;
if ($data['time']) {
if (!is_int($data['time'])) {
Expand Down Expand Up @@ -231,7 +231,7 @@ public static function replaceDatetimeToken(string $token, string $name, string
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public static function replaceUrlToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
public static function replaceUrlToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
$replacement = $token;
if (isset($data['url']) && is_string($data['url'])) {
$url = $data['url'];
Expand Down Expand Up @@ -295,7 +295,7 @@ public static function replaceUrlToken(string $token, string $name, string $qual
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public static function replaceFailToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
public static function replaceFailToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
$replacement = $token;
if (!empty($data['fail_prefix']) && is_string($data['fail_prefix'])) {
$replacement = $data['fail_prefix'];
Expand Down Expand Up @@ -357,7 +357,7 @@ public static function extractTokens(array $tokens, array $data): array {
*
* @throws \Exception
*/
public static function buildTokenReplacement(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
public static function buildTokenReplacement(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
$replacement = $token;
switch ($name) {
case 'feature':
Expand Down