Skip to content

Commit 0250eb2

Browse files
committed
Simplify relative paths to webapp/vendor
When the vendor directory was in lib/vendor, the relative paths from within the webapp directory were "../lib/vendor". When lib/vendor was moved to webapp/vendor in commit ab267ec (Put lib/vendor close to the webapp, 2024-06-23), the relative paths were updated to "../webapp/vendor". This commit simplifies the relative paths to just "vendor" (since we are already in the webapp directory).
1 parent 4f87cbd commit 0250eb2

26 files changed

+33
-34
lines changed

webapp/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ copy-bundle-assets:
2626
# the include paths are broken. We just copy in the data we need
2727
-rm -rf public/bundles/nelmioapidoc
2828
mkdir -p public/bundles/nelmioapidoc
29-
cp -R ../webapp/vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
29+
cp -R vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
3030

3131
clean-l:
3232
-rm -rf public/bundles/nelmioapidoc
@@ -44,9 +44,9 @@ install-domserver:
4444
# Now change all relative symlinks in webapp/public to their correct paths
4545
for link in $$(find $(DESTDIR)$(domserver_webappdir)/public/$$dir -maxdepth 2 -type l); do \
4646
target=$$(readlink $$link) ; \
47-
if echo $${target} | grep -q '\.\./\.\./webapp/vendor' ; then \
47+
if echo $${target} | grep -q '\.\./vendor' ; then \
4848
rm $$link ; \
49-
realtarget=$(domserver_webappdir)/vendor$$(echo $${target} | sed 's!^.*\.\./\.\./webapp/vendor!!') ; \
49+
realtarget=$(domserver_webappdir)/vendor$$(echo $${target} | sed 's!^.*\.\./vendor!!') ; \
5050
ln -s $$realtarget $$link ; \
5151
fi \
5252
done

webapp/bin/console

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
use App\Kernel;
55
use Symfony\Bundle\FrameworkBundle\Console\Application;
66

7-
if (!is_file(dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php')) {
7+
if (!is_file(dirname(__DIR__) . '/vendor/autoload_runtime.php')) {
88
throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
99
}
1010

11-
require_once dirname(__DIR__, 2) . '/webapp/vendor/autoload_runtime.php';
11+
require_once dirname(__DIR__) . '/vendor/autoload_runtime.php';
1212
require_once dirname(__DIR__) . '/config/load_db_secrets.php';
1313

1414
set_time_limit(0);

webapp/bin/phpunit

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@ if (!ini_get('date.timezone')) {
55
ini_set('date.timezone', 'UTC');
66
}
77

8-
if (is_file(dirname(__DIR__, 2) . '/webapp/vendor/phpunit/phpunit/phpunit')) {
8+
if (is_file(dirname(__DIR__) . '/vendor/phpunit/phpunit/phpunit')) {
99
if (PHP_VERSION_ID >= 80000) {
10-
require dirname(__DIR__, 2) . '/webapp/vendor/phpunit/phpunit/phpunit';
10+
require dirname(__DIR__) . '/vendor/phpunit/phpunit/phpunit';
1111
} else {
12-
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__, 2) . '/webapp/vendor/autoload.php');
12+
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php');
1313
require PHPUNIT_COMPOSER_INSTALL;
1414
PHPUnit\TextUI\Command::main();
1515
}
1616
} else {
17-
if (!is_file(dirname(__DIR__,
18-
2) . '/webapp/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
17+
if (!is_file(dirname(__DIR__) . '/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
1918
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
2019
exit(1);
2120
}
2221

23-
require dirname(__DIR__, 2) . '/webapp/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
22+
require dirname(__DIR__) . '/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
2423
}

webapp/public/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../webapp/vendor/twbs/bootstrap/dist/css/bootstrap.min.css
1+
../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css

webapp/public/css/bootstrap.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../webapp/vendor/datatables.net/datatables.net-bs5/css/dataTables.bootstrap5.min.css
1+
../../vendor/datatables.net/datatables.net-bs5/css/dataTables.bootstrap5.min.css
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../webapp/vendor/fortawesome/font-awesome/css/all.min.css
1+
../../vendor/fortawesome/font-awesome/css/all.min.css

webapp/public/css/nv.d3.min.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../webapp/vendor/novus/nvd3/build/nv.d3.min.css
1+
../../vendor/novus/nvd3/build/nv.d3.min.css

webapp/public/css/nv.d3.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../webapp/vendor/apalfrey/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css
1+
../../vendor/apalfrey/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css

0 commit comments

Comments
 (0)