Commit 002c9a7a authored by Ndame Kital's avatar Ndame Kital
Browse files

CS

3 merge requests!9Resolve "enrichir le dossier test sur la base de la nouvelle architecture",!7Resolve "enrichir le dossier test sur la base de la nouvelle architecture",!6WIP: Resolve "migration vers la nouvelle architecture basée sur webpack npm"
Showing with 106 additions and 58 deletions
+106 -58
...@@ -31,14 +31,14 @@ ...@@ -31,14 +31,14 @@
"blueimp/jquery-file-upload": "~9.9", "blueimp/jquery-file-upload": "~9.9",
"doctrine/doctrine-bundle": "^1.6", "doctrine/doctrine-bundle": "^1.6",
"doctrine/orm": "^2.5", "doctrine/orm": "^2.5",
"irstea/theme-bundle": "^2.0", "irstea/theme-bundle": "dev-utilisation_bundle_dans_projet_symfony3.4",
"knplabs/gaufrette": "^0.3", "knplabs/gaufrette": "^0.3",
"knplabs/knp-gaufrette-bundle": "~0.1", "knplabs/knp-gaufrette-bundle": "~0.1",
"pagerfanta/pagerfanta": "^1.0", "pagerfanta/pagerfanta": "^1.0",
"psr/log": "^1.0", "psr/log": "^1.0",
"ramsey/uuid": "^3.0", "ramsey/uuid": "^3.0",
"ramsey/uuid-doctrine": "^1.5", "ramsey/uuid-doctrine": "^1.5",
"sensio/framework-extra-bundle": "^3.0", "sensio/framework-extra-bundle": "^5.3",
"symfony/assetic-bundle": "^2.3", "symfony/assetic-bundle": "^2.3",
"symfony/config": "^3.0", "symfony/config": "^3.0",
"symfony/console": "^3.0", "symfony/console": "^3.0",
...@@ -73,13 +73,21 @@ ...@@ -73,13 +73,21 @@
"irstea/phpcpd-shim": "^3.0", "irstea/phpcpd-shim": "^3.0",
"irstea/phploc-shim": "^4.0", "irstea/phploc-shim": "^4.0",
"irstea/phpmd-config": "^1.0", "irstea/phpmd-config": "^1.0",
"irstea/phpstan-config": "^1.1", "phpstan/phpstan-deprecation-rules": "@stable",
"symfony/browser-kit": "^4.3",
"symfony/css-selector": "^4.3",
"symfony/panther": "^0.5.2",
"irstea/pcov-clobber-plugin": "^1.0",
"symfony/web-server-bundle": "^3.4",
"jakub-onderka/php-parallel-lint": "^1.0", "jakub-onderka/php-parallel-lint": "^1.0",
"pcov/clobber": "^2.0", "pcov/clobber": "^2.0",
"phpunit/phpunit": "^7.0" "irstea/phpstan-config": "^1.1.1",
"phpunit/phpunit": "^7.0"
}, },
"config": { "config": {
"sort-packages": true, "sort-packages": true,
"process-timeout":0,
"preferred-install": "dist",
"platform": { "platform": {
"php": "7.1.30" "php": "7.1.30"
} }
...@@ -89,39 +97,79 @@ ...@@ -89,39 +97,79 @@
"dev-master": "2.x-dev" "dev-master": "2.x-dev"
} }
}, },
"archive": { "archive": {
"exclude": [ "exclude": [
"vendor", "/*",
"phpunit.xml.dist", "!/src",
".git*", "!/doc",
".idea" "!/composer.json",
] "!/package.json",
}, "!/COPYING*",
"scripts": { "!/README.md",
"post-install-cmd": "@clobber-phpunit", ".git*",
"post-update-cmd": "@clobber-phpunit", ".idea"
"clobber-phpunit": "[ -d vendor/phpunit/phpunit ] && vendor/bin/pcov . clobber", ]
},
"scripts": {
"fix-cs": "vendor/bin/php-cs-fixer fix --verbose",
"phploc": "vendor/bin/phploc src tests --exclude tests/Fixtures/var",
"make-icon-lists":[
"npm install",
"perl -ne '/\\.@\\{fa-css-prefix\\}\\-([-\\w]+):before/ and print \"$1\\n\"' node_modules/font-awesome/scss/_icons.scss | sort -u > src/Resources/icons/fa.txt",
"perl -ne '/\\.glyphicon\\-([-\\w]+)/ and print \"$1\\n\"' src/Resources/assets/sass/main.scss | sort -u > src/Resources/icons/glyphicon.txt"
],
"update:lowest": [
"rm -rf vendor composer.lock #",
"@composer update --no-suggest --prefer-stable --prefer-lowest"
],
"update:latest": [
"rm -rf vendor composer.lock #",
"@composer clear-cache #",
"@composer update --no-suggest"
],
"test:lowest": ["@update:lowest", "@test"],
"test:latest": ["@update:latest", "@test"],
"test": [
"@test:lint",
"@test:php-cs-fixer",
"@test:phpcpd",
"@test:phpmd",
"@test:phpstan",
"@test:composer-require-checker",
"@test:phpunit"
],
"test:lint": [
"vendor/bin/parallel-lint -j $(nproc) --exclude tests/Fixtures/var src tests ",
"vendor/bin/yaml-lint src"
],
"test:php-cs-fixer": "vendor/bin/php-cs-fixer fix --dry-run --verbose",
"test:phpcpd": "vendor/bin/phpcpd --fuzzy src tests --exclude=Fixtures/var",
"test:composer-require-checker": "vendor/bin/composer-require-checker",
"test:phpmd": "vendor/bin/phpmd src,tests/Form/,tests/Utils,tests/Listener text ./phpmd-ruleset.xml --suffixes=php",
"test:phpstan": "vendor/bin/phpstan analyse --no-progress",
"fix-cs": "vendor/bin/php-cs-fixer fix --verbose", "test:clear": [
"phploc": "vendor/bin/phploc src tests --exclude tests/Fixtures/var", "if [ -z \"$CI\" ]; then cd tests/Fixtures; rm -rf package-lock.json var node_modules public/assets reports/*; fi #"
"test": [ ],
"@test:lint", "test:install-assets": [
"@test:php-cs-fixer", "@test:clear",
"@test:phpcpd", "cd tests/Fixtures && npm install && npm run dev #"
"@test:phpmd", ],
"@test:phpstan", "test:phpunit": [
"@test:composer-require-checker", "$PANTHER_CHROME_BINARY --version #",
"@test:phpunit" "$PANTHER_CHROME_DRIVER_BINARY --version #",
], "vendor/bin/phpunit --coverage-text --coverage-html=reports/coverage --log-junit=reports/junit.xml"
"test:lint": [ ],
"vendor/bin/parallel-lint -j $(nproc) --exclude tests/Fixtures/var src tests ", "test:serve": [
"vendor/bin/yaml-lint src" "@php tests/console server:run -v --docroot=tests/Fixtures/public"
], ],
"test:php-cs-fixer": "vendor/bin/php-cs-fixer fix --dry-run --verbose",
"test:phpcpd": "vendor/bin/phpcpd --fuzzy src tests --exclude=Fixtures/var", "docker:serve": [
"test:composer-require-checker": "vendor/bin/composer-require-checker", "@test:install-assets",
"test:phpmd": "vendor/bin/phpmd src,tests text ./phpmd-ruleset.xml --suffixes=php", "set -x; IMG=`docker build --build-arg \"PHP_VERSION=${PHP_VERSION:-7.1}\" --pull -q .` && docker run --rm -p 8080:8080 -v ${PWD}:/var/www/theme-bundle -u `id -u`:`id -g` $IMG"
"test:phpstan": "vendor/bin/phpstan analyse --no-progress", ],
"test:phpunit": "vendor/bin/phpunit" "docker:test": [
} "set -x; IMG=`docker build --build-arg \"PHP_VERSION=${PHP_VERSION:-7.1}\" --pull -q .` && docker run --rm -v ${PWD}:/var/www/theme-bundle -u `id -u`:`id -g` $IMG composer test"
]
}
} }
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
<?php declare(strict_types=1); <?php declare(strict_types=1);
/* /*
* irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap. * irstea/file-upload-bundle - Bundle de gestion de fichiers intégrée à Symfony et Twitter-Bootstrap.
* Copyright (C) 2015-2019 Irstea <dsi.poleis.contact@lists.irstea.fr> * Copyright (C) 2015-2020 Irstea <dsi.poleis.contact@lists.irstea.fr>
* *
* This program is free software: you can redistribute it and/or modify it under * This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free * the terms of the GNU Lesser General Public License as published by the Free
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment