8000 Merge branch 'master' into feat/readonly-properties-in-entity-test-case · tarlepp/symfony-flex-backend@78d07b5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 78d07b5

Browse files
tarlepptarlepp
authored
Merge branch 'master' into feat/readonly-properties-in-entity-test-case
2 parents 037deec + 4c73b13 commit 78d07b5
  • UserGroupsController.php
  • UserRolesController.php
  • UserGroup
  • DataFixtures/ORM
  • Decorator
  • EventListener
  • EventSubscriber
  • Form
  • Request/ParamConverter
  • Rest
  • Security
  • Serializer/Normalizer
  • Service
  • Utils
  • Validator/Constraints
  • tests/Integration
  • tools

    • Some content is hidden

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

    116 files changed

    +736
    -728
    lines changed

    ‎.idea/misc.xml

    Lines changed: 0 additions & 8 deletions
    This file was deleted.

    ‎.idea/php-test-framework.xml

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

    ‎.idea/php.xml

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

    ‎.idea/remote-mappings.xml

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

    ‎.idea/symfony2.xml

    Lines changed: 2 additions & 2 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.1.5-fpm
    1+
    FROM php:8.1.6-fpm
    22

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

    1212
    # Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
    13-
    COPY --from=mlocati/php-extension-installer:1.5.11 /usr/bin/install-php-extensions /usr/local/bin/
    13+
    COPY --from=mlocati/php-extension-installer:1.5.16 /usr/bin/install-php-extensions /usr/local/bin/
    1414

    1515
    # Install and enable all necessary PHP extensions
    1616
    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.1.5-fpm
    1+
    FROM php:8.1.6-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.1
    13-
    ENV NODE_VERSION 18.0.0
    13+
    ENV NODE_VERSION 18.2.0
    1414

    1515
    # Update package list and install necessary libraries
    1616
    RUN apt-get update \
    @@ -20,7 +20,7 @@ RUN apt-get update \
    2020
    && rm -rf /var/lib/apt/lists/*
    2121

    2222
    # Copy the install-php-extensions (Easily install PHP extension in official PHP Docker containers)
    23-
    COPY --from=mlocati/php-extension-installer:1.5.11 /usr/bin/install-php-extensions /usr/local/bin/
    23+
    COPY --from=mlocati/php-extension-installer:1.5.16 /usr/bin/install-php-extensions /usr/local/bin/
    2424

    2525
    # Enable all necessary PHP packages
    2626
    RUN install-php-extensions \

    ‎composer.json

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -28,7 +28,7 @@
    2828
    "doctrine/doctrine-bundle": "2.6.3",
    2929
    "doctrine/doctrine-migrations-bundle": "3.2.2",
    3030
    "doctrine/orm": "2.12.2",
    31-
    "gedmo/doctrine-extensions": "3.6.0",
    31+
    "gedmo/doctrine-extensions": "3.7.0",
    3232
    "lexik/jwt-authentication-bundle": "2.15.1",
    3333
    "mark-gerarts/automapper-plus-bundle": "1.4.1",
    3434
    "matomo/device-detector": "6.0.0",
    @@ -46,7 +46,7 @@
    4646
    "symfony/flex": "2.1.8",
    4747
    "symfony/form": "6.0.8",
    4848
    "symfony/framework-bundle": "6.0.8",
    49-
    "symfony/monolog-bundle": "3.7.1",
    49+
    "symfony/monolog-bundle": "3.8.0",
    5050
    "symfony/process": "6.0.8",
    5151
    "symfony/property-access": "6.0.8",
    5252
    "symfony/property-info": "6.0.7",
    @@ -71,7 +71,7 @@
    7171
    "roave/security-advisories": "dev-latest",
    7272
    "symfony/browser-kit": "6.0.3",
    7373
    "symfony/debug-bundle": "6.0.3",
    74-
    "symfony/maker-bundle": "1.41.0",
    74+
    "symfony/maker-bundle": "1.43.0",
    7575
    "symfony/requirements-checker": "2.0.1",
    7676
    "symfony/stopwatch": "6.0.5",
    7777
    "symfony/var-dumper": "6.0.8",

    0 commit comments

    Comments
     (0)
    0