Merge pull request 'Allow devs to directly open profiler links in php storm IDE' (#2 ) from skeleton/phpstorm-dev-integration into main

Reviewed-on: #2
Merge remote-tracking branch 'origin/config-chill-budget' into main
2023-03-08 15:46:30 +00:00 · 2023-03-08 16:42:56 +01:00 · 2023-03-08 16:07:55 +01:00 · 2023-03-08 10:45:52 +01:00 · 2023-03-08 10:29:07 +01:00 · 2023-03-07 15:06:15 +01:00
8 changed files with 65 additions and 61 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -11,3 +11,5 @@ MAILER_URL=smtp://smtp:1025
 PGADMIN_DEFAULT_EMAIL=admin@chill.social
 PGADMIN_DEFAULT_PASSWORD=password

+## Phpstorm IDE project path
+PROJECT_DIR=
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ config/secrets/

 ## env files
 .env.local
+.env.dev.local

 .composer/*
 composer.phar
@@ -49,17 +50,18 @@ phpunit.xml
 nbproject/*

 .idea
+.ignore

 ### template/api/specs.yaml should be compiled
 templates/api/specs.yaml

-
 ###> symfony/webpack-encore-bundle ###
 /node_modules/
 /public/build/
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
+
 ###> symfony/phpunit-bridge ###
 .phpunit
 .phpunit.result.cache
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
    },
    "require": {
        "ext-redis": "*",
-        "chill-project/chill-bundles": "dev-master#c64ec89274196fa1532fc88584a3a88430c4cfa1",
+        "chill-project/chill-bundles": "dev-master#de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
        "symfony/flex": "^1.9",
        "symfony/http-client": "^4.4 || ^5",
        "nelmio/alice": "^3.8",
@@ -23,8 +23,7 @@
        "phpstan/phpstan": "^1.0",
        "spomky-labs/base64url": "^2.0",
        "twig/string-extra": "^3.3",
-        "symfony/mailer": "^5.4",
-        "symfony/dependency-injection": "5.4.16"
+        "symfony/mailer": "^5.4"
    },
    "require-dev": {
        "fakerphp/faker": "^1.13",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "1ca80eaac185c24391302101a2d24efd",
+    "content-hash": "a31ca489792a6a2e37aa63ff45008c4b",
    "packages": [
        {
            "name": "brick/math",
@@ -232,12 +232,12 @@
            "source": {
                "type": "git",
                "url": "git@gitlab.com:Chill-Projet/chill-bundles.git",
-                "reference": "c64ec89274196fa1532fc88584a3a88430c4cfa1"
+                "reference": "de55ff920f1ffee00b0d5ea47aa5028a23dff5a7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=c64ec89274196fa1532fc88584a3a88430c4cfa1",
-                "reference": "c64ec89274196fa1532fc88584a3a88430c4cfa1",
+                "url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
+                "reference": "de55ff920f1ffee00b0d5ea47aa5028a23dff5a7",
                "shasum": ""
            },
            "require": {
@@ -343,7 +343,7 @@
                "chill",
                "social worker"
            ],
-            "time": "2023-02-01T13:14:43+00:00"
+            "time": "2023-01-31T18:41:43+00:00"
        },
        {
            "name": "composer/package-versions-deprecated",
@@ -420,16 +420,16 @@
        },
        {
            "name": "doctrine/annotations",
-            "version": "1.14.3",
+            "version": "1.14.2",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af"
+                "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
-                "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/ad785217c1e9555a7d6c6c8c9f406395a5e2882b",
+                "reference": "ad785217c1e9555a7d6c6c8c9f406395a5e2882b",
                "shasum": ""
            },
            "require": {
@@ -490,9 +490,9 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.14.3"
+                "source": "https://github.com/doctrine/annotations/tree/1.14.2"
            },
-            "time": "2023-02-01T09:20:38+00:00"
+            "time": "2022-12-15T06:48:22+00:00"
        },
        {
            "name": "doctrine/cache",
@@ -3038,21 +3038,21 @@
        },
        {
            "name": "knpuniversity/oauth2-client-bundle",
-            "version": "v2.13.0",
+            "version": "v2.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/knpuniversity/oauth2-client-bundle.git",
-                "reference": "3d130053e7e510a97f976ca5ba3107e5bd84c9bc"
+                "reference": "d162e3da5d2fd6e71401de8ce23c75abe1457a05"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/knpuniversity/oauth2-client-bundle/zipball/3d130053e7e510a97f976ca5ba3107e5bd84c9bc",
-                "reference": "3d130053e7e510a97f976ca5ba3107e5bd84c9bc",
+                "url": "https://api.github.com/repos/knpuniversity/oauth2-client-bundle/zipball/d162e3da5d2fd6e71401de8ce23c75abe1457a05",
+                "reference": "d162e3da5d2fd6e71401de8ce23c75abe1457a05",
                "shasum": ""
            },
            "require": {
                "league/oauth2-client": "^2.0",
-                "php": ">=7.4",
+                "php": ">=7.2.5",
                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
                "symfony/framework-bundle": "^4.4|^5.0|^6.0",
                "symfony/http-foundation": "^4.4|^5.0|^6.0",
@@ -3092,9 +3092,9 @@
            ],
            "support": {
                "issues": "https://github.com/knpuniversity/oauth2-client-bundle/issues",
-                "source": "https://github.com/knpuniversity/oauth2-client-bundle/tree/v2.13.0"
+                "source": "https://github.com/knpuniversity/oauth2-client-bundle/tree/v2.12.0"
            },
-            "time": "2023-02-02T14:57:35+00:00"
+            "time": "2023-01-31T15:00:52+00:00"
        },
        {
            "name": "laminas/laminas-code",
@@ -6086,16 +6086,16 @@
        },
        {
            "name": "sebastian/recursion-context",
-            "version": "4.0.5",
+            "version": "4.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
                "shasum": ""
            },
            "require": {
@@ -6134,10 +6134,10 @@
                }
            ],
            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "https://github.com/sebastianbergmann/recursion-context",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
            "support": {
                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
            },
            "funding": [
                {
@@ -6145,7 +6145,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T06:07:39+00:00"
+            "time": "2020-10-26T13:17:30+00:00"
        },
        {
            "name": "sensio/framework-extra-bundle",
@@ -7062,16 +7062,16 @@
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v5.4.16",
+            "version": "v5.4.20",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "a93e1863500940780fc1235f52d54397be2d14b3"
+                "reference": "8185ed0df129005a26715902f1a53bad0fe67102"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a93e1863500940780fc1235f52d54397be2d14b3",
-                "reference": "a93e1863500940780fc1235f52d54397be2d14b3",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8185ed0df129005a26715902f1a53bad0fe67102",
+                "reference": "8185ed0df129005a26715902f1a53bad0fe67102",
                "shasum": ""
            },
            "require": {
@@ -7131,7 +7131,7 @@
            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.16"
+                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.20"
            },
            "funding": [
                {
@@ -7147,7 +7147,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-25T07:33:13+00:00"
+            "time": "2023-01-27T11:08:11+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -13406,16 +13406,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.6.0",
+            "version": "9.5.28",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "70fc8be1d0b9fad56a199a4df5f9cfabfc246f84"
+                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/70fc8be1d0b9fad56a199a4df5f9cfabfc246f84",
-                "reference": "70fc8be1d0b9fad56a199a4df5f9cfabfc246f84",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e",
+                "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e",
                "shasum": ""
            },
            "require": {
@@ -13457,7 +13457,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "9.6-dev"
+                    "dev-master": "9.5-dev"
                }
            },
            "autoload": {
@@ -13488,7 +13488,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.0"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28"
            },
            "funding": [
                {
@@ -13504,7 +13504,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-03T07:32:24+00:00"
+            "time": "2023-01-14T12:32:24+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@@ -13732,16 +13732,16 @@
        },
        {
            "name": "sebastian/environment",
-            "version": "5.1.5",
+            "version": "5.1.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                "shasum": ""
            },
            "require": {
@@ -13783,7 +13783,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
            },
            "funding": [
                {
@@ -13791,7 +13791,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T06:03:51+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
        },
        {
            "name": "sebastian/global-state",
@@ -14083,16 +14083,16 @@
        },
        {
            "name": "sebastian/type",
-            "version": "3.2.1",
+            "version": "3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
                "shasum": ""
            },
            "require": {
@@ -14127,7 +14127,7 @@
            "homepage": "https://github.com/sebastianbergmann/type",
            "support": {
                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
            },
            "funding": [
                {
@@ -14135,7 +14135,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T06:13:03+00:00"
+            "time": "2022-09-12T14:47:03+00:00"
        },
        {
            "name": "sebastian/version",
--- a/config/packages/chill_budget.yaml
+++ b/config/packages/chill_budget.yaml
@@ -56,7 +56,6 @@ chill_budget:
            - { key: mutuelle, labels: [{lang: fr, label: "Mutuelle"}]}
            - { key: transport, labels: [{lang: fr, label: "Frais de transport"}]}
            - { key: decouvbank, labels: [{lang: fr, label: "Découvert bancaire utilisé"}]}
-            - { key: credit, labels: [{lang: fr, label: "Procédure de saisie"}]}
            - { key: procsaisie, labels: [{lang: fr, label: "Procédure de saisie"}]}
            - { key: indus, labels: [{lang: fr, label: "Indus"}]}
            - { key: apurement, labels: [{lang: fr, label: "Plan d'apurement"}]}
--- a/config/packages/dev/framework.yaml
+++ b/config/packages/dev/framework.yaml
@@ -3,3 +3,10 @@ framework:
        # allow to debug from ngrok, useful for webhooks coming from outside:
        - '^(.+\.)?ngrok\.io$'
        - 'nginx'
+
+    ## Open files in phpstorm IDE from profiler links
+    # ref: https://symfony.com/doc/current/reference/configuration/framework.html#ide
+    # need: https://github.com/sanduhrs/phpstorm-url-handler/blob/master/phpstorm-url-handler
+    # set var in file .env.dev.local (PROJECT_DIR=<relative path from home folder>)
+    ide: 'phpstorm://open?file=%%f&line=%%l&/var/www/app/>%env(resolve:PROJECT_DIR)%'
+
--- a/config/packages/wopi.yaml
+++ b/config/packages/wopi.yaml
@@ -1,2 +1,3 @@
 wopi:
  server: "%env(resolve:WOPI_SERVER)%"
+  enable_lock: false
--- a/symfony.lock
+++ b/symfony.lock
@@ -358,9 +358,6 @@
    "psr/http-message": {
        "version": "1.0.1"
    },
-    "psr/link": {
-        "version": "1.0.0"
-    },
    "psr/log": {
        "version": "1.1.3"
    },
@@ -820,9 +817,6 @@
    "symfony/var-exporter": {
        "version": "v5.1.3"
    },
-    "symfony/web-link": {
-        "version": "v5.2.12"
-    },
    "symfony/web-profiler-bundle": {
        "version": "3.3",
        "recipe": {
Author	SHA1	Message	Date
Mathieu Jaumotte	efed281312	Merge pull request 'Allow devs to directly open profiler links in php storm IDE' (#2 ) from skeleton/phpstorm-dev-integration into main Reviewed-on: #2	2023-03-08 15:46:30 +00:00
Mathieu Jaumotte	a6a988a33a	Merge remote-tracking branch 'origin/config-chill-budget' into main	2023-03-08 16:42:56 +01:00
Mathieu Jaumotte	859eb37526	Merge remote-tracking branch 'origin/main' into main	2023-03-08 16:07:55 +01:00
Mathieu Jaumotte	b55914e40f	add a generic .ignore directory	2023-03-08 10:45:52 +01:00
Mathieu Jaumotte	7f1085d2c2	DX: add dev config for profiler <-> phpstorm links integration	2023-03-08 10:29:07 +01:00
Lucas Silva	b81638eda9	Fix error credit	2023-03-07 15:06:15 +01:00
Julien Fastré	da2149cb60	Deploy: update dependencies All checks were successful continuous-integration/drone/tag Build is passing Details	2023-02-01 12:46:15 +01:00