Skip to content

Commit 6e3bdfb

Browse files
Merge branch 'development' of https://github.com/AndreasEngelmark/os2loop into development
# Conflicts: # composer.lock
2 parents 28c680a + cce9285 commit 6e3bdfb

File tree

310 files changed

+8446
-7893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

310 files changed

+8446
-7893
lines changed

README.md

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,6 @@ read on the url reported by
7878
echo "http://$(docker-compose port mailhog 8025)"
7979
```
8080

81-
#### Using `symfony` binary
82-
83-
```sh
84-
docker-compose up --detach
85-
symfony composer install
86-
symfony php vendor/bin/drush --yes site:install os2loop --existing-config
87-
# Start the server
88-
symfony local:server:start --port=8000 --daemon
89-
# Get the site url
90-
echo "http://127.0.0.1:8000"
91-
# Get admin sign in url
92-
symfony php vendor/bin/drush --uri=https://127.0.0.1:8000 user:login
93-
```
94-
9581
### Fixtures
9682

9783
We have fixtures for all content types.
@@ -100,15 +86,15 @@ To load all content type fixtures, run:
10086

10187
```sh
10288
# Find and enable all fixtures modules
103-
vendor/bin/drush --yes pm:enable $(find web/profiles/custom/os2loop/modules/ -type f -name 'os2loop_*_fixtures.info.yml' -exec basename -s .info.yml {} \;)
89+
docker-compose exec phpfpm vendor/bin/drush --yes pm:enable $(find web/profiles/custom/os2loop/modules/ -type f -name 'os2loop_*_fixtures.info.yml' -exec basename -s .info.yml {} \;)
10490
# Disable "Entity Reference Integrity Enforce" module to be able to delete (purge) content before loading fixtures.
105-
vendor/bin/drush --yes pm:uninstall entity_reference_integrity_enforce
91+
docker-compose exec phpfpm vendor/bin/drush --yes pm:uninstall entity_reference_integrity_enforce
10692
# Load the fixtures
107-
vendor/bin/drush --yes content-fixtures:load
93+
docker-compose exec phpfpm vendor/bin/drush --yes content-fixtures:load
10894
# Uninstall all fixtures modules
109-
vendor/bin/drush --yes pm:uninstall content_fixtures
95+
docker-compose exec phpfpm vendor/bin/drush --yes pm:uninstall content_fixtures
11096
# Enable "Entity Reference Integrity Enforce" module
111-
vendor/bin/drush --yes pm:enable entity_reference_integrity_enforce
97+
docker-compose exec phpfpm vendor/bin/drush --yes pm:enable entity_reference_integrity_enforce
11298
```
11399

114100
## Updates

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
"drupal/snowball_stemmer": "^2.0",
7676
"drupal/theme_switcher": "dev-8.x-1.x",
7777
"drupal/toc_api": "^1.1",
78+
"drupal/toc_filter": "^2.0",
7879
"drupal/token": "^1.9",
7980
"drupal/token_filter": "^1.2",
8081
"drupal/twig_tweak": "^3.0",
@@ -124,12 +125,12 @@
124125
"sort-packages": true,
125126
"process-timeout": 0,
126127
"allow-plugins": {
127-
"cweagans/composer-patches": true,
128128
"composer/installers": true,
129-
"drupal/core-composer-scaffold": true,
130-
"drupal/core-project-message": true,
129+
"cweagans/composer-patches": true,
131130
"dealerdirect/phpcodesniffer-composer-installer": true,
132-
"drupal/console-extend-plugin": true
131+
"drupal/console-extend-plugin": true,
132+
"drupal/core-composer-scaffold": true,
133+
"drupal/core-project-message": true
133134
}
134135
},
135136
"extra": {

0 commit comments

Comments
 (0)