Skip to content

Commit e886975

Browse files
committed
OXDEV-8623 Adopted recipe for root installation
1 parent eff3510 commit e886975

2 files changed

Lines changed: 15 additions & 21 deletions

File tree

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
},
3636
"autoload": {
3737
"psr-4": {
38-
"OxidEsales\\GraphQL\\Base\\": "src",
39-
"OxidEsales\\GraphQL\\Base\\Tests\\": "tests"
38+
"OxidEsales\\GraphQL\\Base\\": "src"
4039
}
4140
},
4241
"minimum-stability": "dev",
@@ -77,7 +76,8 @@
7776
},
7877
"autoload-dev": {
7978
"psr-4": {
80-
"OxidEsales\\EshopCommunity\\Tests\\": "./vendor/oxid-esales/oxideshop-ce/tests"
79+
"OxidEsales\\EshopCommunity\\Tests\\": "./vendor/oxid-esales/oxideshop-ce/tests",
80+
"OxidEsales\\GraphQL\\Base\\Tests\\": "./tests"
8181
}
8282
}
8383
}

recipes/setup-development.sh

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,11 @@ $SCRIPT_PATH/parts/shared/require_shop_edition_packages.sh -e"${edition}" -v"dev
4141
$SCRIPT_PATH/parts/shared/require_twig_components.sh -e"${edition}" -b"b-7.3.x"
4242
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/developer-tools" -v"dev-b-7.3.x"
4343
$SCRIPT_PATH/parts/shared/require.sh -n"oxid-esales/oxideshop-doctrine-migration-wrapper" -v"dev-b-7.3.x"
44-
docker compose exec -T php composer require oxid-esales/apex-theme dev-b-7.3.x
44+
$SCRIPT_PATH/parts/shared/require_theme_dev.sh -t"apex" -b"b-7.3.x"
4545

4646
git clone https://github.com/OXID-eSales/oxapi-documentation source/documentation/oxapi-documentation
4747
make docpath=./source/documentation/oxapi-documentation addsphinxservice
4848

49-
docker-compose exec -T -w /var/www php \
50-
composer config allow-plugins.oxid-esales/oxideshop-composer-plugin true
51-
52-
perl -pi -e '
53-
BEGIN {
54-
$inserted = 0;
55-
$autoload_dev = qq( "autoload-dev": {\n "psr-4": {\n "OxidEsales\\\\EshopCommunity\\\\Tests\\\\": "./vendor/oxid-esales/oxideshop-ce/tests"\n }\n },\n);
56-
}
57-
if (!$inserted && $_ =~ /"repositories":/) {
58-
$_ = $autoload_dev . $_;
59-
$inserted = 1;
60-
}
61-
' source/composer.json
62-
63-
6449
make up
6550

6651
docker compose exec php composer update --no-interaction
@@ -72,10 +57,19 @@ perl -pi\
7257
$SCRIPT_PATH/parts/shared/setup_database.sh --no-demodata
7358

7459
docker compose exec -T php vendor/bin/oe-console oe:module:install ./
75-
76-
$SCRIPT_PATH/parts/shared/reset_database.sh --no-demodata
60+
docker compose exec -T php vendor/bin/oe-eshop-doctrine_migration migrations:migrate
61+
docker compose exec -T php vendor/bin/oe-eshop-db_views_generate
7762

7863
docker compose exec -T php vendor/bin/oe-console oe:module:activate oe_graphql_base
7964
docker compose exec -T php vendor/bin/oe-console oe:theme:activate apex
8065

8166
$SCRIPT_PATH/parts/shared/create_admin.sh
67+
68+
# Register all related project packages git repositories
69+
mkdir -p .idea; mkdir -p source/.idea; cp "${SCRIPT_PATH}/parts/bases/vcs.xml.base" .idea/vcs.xml
70+
perl -pi\
71+
-e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source" vcs="Git" />\n </component>#g;'\
72+
-e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-ce" vcs="Git" />\n </component>#g;'\
73+
-e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-pe" vcs="Git" />\n </component>#g;'\
74+
-e 's#</component>#<mapping directory="\$PROJECT_DIR\$/source/vendor/oxid-esales/oxideshop-ee" vcs="Git" />\n </component>#g;'\
75+
.idea/vcs.xml

0 commit comments

Comments
 (0)