Skip to content
Snippets Groups Projects
Commit 623cc5b6 authored by Marko Ivancic's avatar Marko Ivancic
Browse files

Merge branch 'fix/ssp-rc3' into 'main'

Move dir www to public

See merge request !3
parents 15f5675c ea0f4a95
No related branches found
No related tags found
1 merge request!3Move dir www to public
Pipeline #76870 passed
Showing
with 31 additions and 30 deletions
......@@ -154,16 +154,16 @@
},
{
"name": "doctrine/dbal",
"version": "3.5.3",
"version": "3.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"
"reference": "85b98cb23c8af471a67abfe14485da696bcabc2e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e",
"reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/85b98cb23c8af471a67abfe14485da696bcabc2e",
"reference": "85b98cb23c8af471a67abfe14485da696bcabc2e",
"shasum": ""
},
"require": {
......@@ -176,11 +176,12 @@
"psr/log": "^1|^2|^3"
},
"require-dev": {
"doctrine/coding-standard": "11.0.0",
"doctrine/coding-standard": "11.1.0",
"fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2022.3",
"phpstan/phpstan": "1.9.4",
"phpstan/phpstan": "1.9.14",
"phpstan/phpstan-strict-rules": "^1.4",
"phpunit/phpunit": "9.5.27",
"phpunit/phpunit": "9.6.3",
"psalm/plugin-phpunit": "0.18.4",
"squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^5.4|^6.0",
......@@ -245,7 +246,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.5.3"
"source": "https://github.com/doctrine/dbal/tree/3.6.0"
},
"funding": [
{
......@@ -261,7 +262,7 @@
"type": "tidelift"
}
],
"time": "2023-01-12T10:21:44+00:00"
"time": "2023-02-07T22:52:03+00:00"
},
{
"name": "doctrine/deprecations",
......@@ -1022,16 +1023,16 @@
},
{
"name": "composer/composer",
"version": "2.5.2",
"version": "2.5.4",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "c76c013c555160410af47c03a0e173518e3f5796"
"reference": "6b67eeea4d72051c369ccdbfb2423a56e2ab51a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/c76c013c555160410af47c03a0e173518e3f5796",
"reference": "c76c013c555160410af47c03a0e173518e3f5796",
"url": "https://api.github.com/repos/composer/composer/zipball/6b67eeea4d72051c369ccdbfb2423a56e2ab51a9",
"reference": "6b67eeea4d72051c369ccdbfb2423a56e2ab51a9",
"shasum": ""
},
"require": {
......@@ -1115,7 +1116,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/2.5.2"
"source": "https://github.com/composer/composer/tree/2.5.4"
},
"funding": [
{
......@@ -1131,7 +1132,7 @@
"type": "tidelift"
}
],
"time": "2023-02-04T13:33:22+00:00"
"time": "2023-02-15T12:10:06+00:00"
},
{
"name": "composer/metadata-minifier",
......@@ -7508,16 +7509,16 @@
},
{
"name": "twig/intl-extra",
"version": "v3.5.0",
"version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/intl-extra.git",
"reference": "92f2c73471e077d0f72195a331c9a245da2010cd"
"reference": "c3ebfac1624228c0556de57a34af6b7d83a1a408"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/intl-extra/zipball/92f2c73471e077d0f72195a331c9a245da2010cd",
"reference": "92f2c73471e077d0f72195a331c9a245da2010cd",
"url": "https://api.github.com/repos/twigphp/intl-extra/zipball/c3ebfac1624228c0556de57a34af6b7d83a1a408",
"reference": "c3ebfac1624228c0556de57a34af6b7d83a1a408",
"shasum": ""
},
"require": {
......@@ -7561,7 +7562,7 @@
"twig"
],
"support": {
"source": "https://github.com/twigphp/intl-extra/tree/v3.5.0"
"source": "https://github.com/twigphp/intl-extra/tree/v3.5.1"
},
"funding": [
{
......@@ -7573,20 +7574,20 @@
"type": "tidelift"
}
],
"time": "2022-12-27T12:23:36+00:00"
"time": "2023-02-08T07:44:55+00:00"
},
{
"name": "twig/twig",
"version": "v3.5.0",
"version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72"
"reference": "a6e0510cc793912b451fd40ab983a1d28f611c15"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72",
"reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/a6e0510cc793912b451fd40ab983a1d28f611c15",
"reference": "a6e0510cc793912b451fd40ab983a1d28f611c15",
"shasum": ""
},
"require": {
......@@ -7637,7 +7638,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v3.5.0"
"source": "https://github.com/twigphp/Twig/tree/v3.5.1"
},
"funding": [
{
......@@ -7649,7 +7650,7 @@
"type": "tidelift"
}
],
"time": "2022-12-27T12:28:18+00:00"
"time": "2023-02-08T07:49:20+00:00"
},
{
"name": "vimeo/psalm",
......
......@@ -4,12 +4,12 @@
<file>config-templates</file>
<file>src</file>
<file>tests</file>
<file>www</file>
<file>public</file>
<!-- Use this to exclude paths. You can have multiple patterns -->
<!--<exclude-pattern>*/tests/*</exclude-pattern>-->
<!--<exclude-pattern>*/other/*</exclude-pattern>-->
<exclude-pattern>www/assets/*</exclude-pattern>
<exclude-pattern>public/assets/*</exclude-pattern>
<!-- This is the rule we inherit from. If you want to exlude some specific rules, see the docs on how to do that -->
<rule ref="PSR12"/>
......
......@@ -10,7 +10,7 @@
<directory name="src" />
<directory name="config-templates" />
<directory name="tests" />
<directory name="www" />
<directory name="public" />
<directory name="hooks" />
<ignoreFiles>
......
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment