Skip to content

Commit 1c94e54

Browse files
authored
Merge branch 'master' into chore(ci)/use-php-83-in-actions
2 parents a5dbcc4 + e9189c5 commit 1c94e54

Some content is hidden

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

54 files changed

+139
-18
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,8 @@ jobs:
171171
- name: Run PHPStan static analysis tool
172172
run: make phpstan-github
173173

174-
# Disabled this because of - https://github.com/nunomaduro/phpinsights/issues/622
175-
#- name: Run `phploc` to collect LOC stats
176-
# run: make phploc
174+
- name: Run `phploc` to collect LOC stats
175+
run: make phploc
177176

178177
- name: Run `PHP Insights` static analysis tool
179178
run: make phpinsights

.idea/php.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/symfony-flex-backend.iml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2.12-fpm
1+
FROM php:8.3.0-fpm
22

33
ENV APP_ENV prod
44
ENV APP_DEBUG 0
@@ -18,7 +18,7 @@ RUN apt-get update \
1818
&& rm -rf /var/lib/apt/lists/*
1919

2020
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
21-
COPY --from=mlocati/php-extension-installer:2.1.61 /usr/bin/install-php-extensions /usr/local/bin/
21+
COPY --from=mlocati/php-extension-installer:2.1.68 /usr/bin/install-php-extensions /usr/local/bin/
2222

2323
# Install and enable all necessary PHP extensions
2424
RUN install-php-extensions \

Dockerfile_dev

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2.12-fpm
1+
FROM php:8.3.0-fpm
22

33
# Let's use bash as a default shell with login each time
44
SHELL ["/bin/bash", "--login", "-c"]
@@ -10,7 +10,7 @@ ARG HOST_GID
1010
# Declare constants
1111
ENV PATH "$PATH:/home/dev/.composer/vendor/bin:/app/vendor/bin"
1212
ENV NVM_VERSION v0.39.5
13-
ENV NODE_VERSION 21.1.0
13+
ENV NODE_VERSION 21.3.0
1414

1515
# Update package list and install necessary libraries
1616
RUN apt-get update \
@@ -56,7 +56,7 @@ ENV LANGUAGE en_US:en
5656
ENV LC_ALL en_US.UTF-8
5757

5858
# Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
59-
COPY --from=mlocati/php-extension-installer:2.1.61 /usr/bin/install-php-extensions /usr/local/bin/
59+
COPY --from=mlocati/php-extension-installer:2.1.68 /usr/bin/install-php-extensions /usr/local/bin/
6060

6161
# Enable all necessary PHP packages
6262
RUN install-php-extensions \

migrations/Version20211118171749.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
99
use Doctrine\DBAL\Schema\Schema;
1010
use Doctrine\Migrations\AbstractMigration;
11+
use Override;
1112

1213
/**
1314
* Auto-generated Migration: Please modify to your needs!
@@ -17,6 +18,7 @@ final class Version20211118171749 extends AbstractMigration
1718
/**
1819
* @noinspection PhpMissingParentCallCommonInspection
1920
*/
21+
#[Override]
2022
public function getDescription(): string
2123
{
2224
return 'Initial database structure';
@@ -25,6 +27,7 @@ public function getDescription(): string
2527
/**
2628
* @throws Exception
2729
*/
30+
#[Override]
2831
public function up(Schema $schema): void
2932
{
3033
// this up() migration is auto-generated, please modify it to your needs
@@ -68,6 +71,7 @@ public function up(Schema $schema): void
6871
*
6972
* @throws Exception
7073
*/
74+
#[Override]
7175
public function down(Schema $schema): void
7276
{
7377
// this down() migration is auto-generated, please modify it to your needs

migrations/Version20220312135411.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
88
use Doctrine\DBAL\Schema\Schema;
99
use Doctrine\Migrations\AbstractMigration;
10+
use Override;
1011

1112
/**
1213
* Auto-generated Migration: Please modify to your needs!
@@ -16,11 +17,13 @@ final class Version20220312135411 extends AbstractMigration
1617
/**
1718
* @noinspection PhpMissingParentCallCommonInspection
1819
*/
20+
#[Override]
1921
public function getDescription(): string
2022
{
2123
return 'Added missing cascade on delete for the `log_login_failure` table';
2224
}
2325

26+
#[Override]
2427
public function up(Schema $schema): void
2528
{
2629
// this up() migration is auto-generated, please modify it to your needs
@@ -36,6 +39,7 @@ public function up(Schema $schema): void
3639
/**
3740
* @noinspection PhpMissingParentCallCommonInspection
3841
*/
42+
#[Override]
3943
public function down(Schema $schema): void
4044
{
4145
// this down() migration is auto-generated, please modify it to your needs

migrations/Version20220324162224.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
use Doctrine\DBAL\Schema\Schema;
77
use Doctrine\Migrations\AbstractMigration;
8+
use Override;
89

910
/**
1011
* Auto-generated Migration: Please modify to your needs!
@@ -14,11 +15,13 @@ final class Version20220324162224 extends AbstractMigration
1415
/**
1516
* @noinspection PhpMissingParentCallCommonInspection
1617
*/
18+
#[Override]
1719
public function getDescription(): string
1820
{
1921
return 'Added username column to log_login table, so that after user deletion there is reference to the user.';
2022
}
2123

24+
#[Override]
2225
public function up(Schema $schema): void
2326
{
2427
$this->addSql('ALTER TABLE log_login ADD username VARCHAR(255) NOT NULL AFTER type');
@@ -27,6 +30,7 @@ public function up(Schema $schema): void
2730
/**
2831
* @noinspection PhpMissingParentCallCommonInspection
2932
*/
33+
#[Override]
3034
public function down(Schema $schema): void
3135
{
3236
$this->addSql('ALTER TABLE log_login DROP username');

migrations/Version20220812161020.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
88
use Doctrine\DBAL\Schema\Schema;
99
use Doctrine\Migrations\AbstractMigration;
10+
use Override;
1011

1112
/**
1213
* Auto-generated Migration: Please modify to your needs!
@@ -16,11 +17,13 @@ final class Version20220812161020 extends AbstractMigration
1617
/**
1718
* @noinspection PhpMissingParentCallCommonInspection
1819
*/
20+
#[Override]
1921
public function getDescription(): string
2022
{
2123
return 'TODO: Describe reason for this migration';
2224
}
2325

26+
#[Override]
2427
public function up(Schema $schema): void
2528
{
2629
// this up() migration is auto-generated, please modify it to your needs
@@ -41,6 +44,7 @@ public function up(Schema $schema): void
4144
/**
4245
* @noinspection PhpMissingParentCallCommonInspection
4346
*/
47+
#[Override]
4448
public function down(Schema $schema): void
4549
{
4650
// this down() migration is auto-generated, please modify it to your needs

migrations/Version20230930102814.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
88
use Doctrine\DBAL\Schema\Schema;
99
use Doctrine\Migrations\AbstractMigration;
10+
use Override;
1011

1112
/**
1213
* Auto-generated Migration: Please modify to your needs!
@@ -16,11 +17,13 @@ final class Version20230930102814 extends AbstractMigration
1617
/**
1718
* @noinspection PhpMissingParentCallCommonInspection
1819
*/
20+
#[Override]
1921
public function getDescription(): string
2022
{
2123
return 'TODO: Describe reason for this migration';
2224
}
2325

26+
#[Override]
2427
public function up(Schema $schema): void
2528
{
2629
// this up() migration is auto-generated, please modify it to your needs
@@ -41,6 +44,7 @@ public function up(Schema $schema): void
4144
/**
4245
* @noinspection PhpMissingParentCallCommonInspection
4346
*/
47+
#[Override]
4448
public function down(Schema $schema): void
4549
{
4650
// this down() migration is auto-generated, please modify it to your needs

0 commit comments

Comments
 (0)