Skip to content

Commit

Permalink
Merge pull request afup#1519 from Mopolo/planete-suppression-ancien-code
Browse files Browse the repository at this point in the history
Suppression du code dans l'ancien planete-php
  • Loading branch information
agallou authored Aug 24, 2024
2 parents 1aa6455 + 2cac9cc commit ee7d30a
Show file tree
Hide file tree
Showing 33 changed files with 5 additions and 930 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ behat:

### Tests fonctionnels
test-functional: data config htdocs/uploads tmp
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest planetetest mailcatcher
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest mailcatcher
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) up -d dbtest apachephptest mailcatcher
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) run --no-deps --rm cliphp ./bin/behat -c behat-planete.yml
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest planetetest mailcatcher
CURRENT_UID=$(CURRENT_UID) $(DOCKER_COMPOSE_BIN) stop dbtest apachephptest mailcatcher

### Analyse PHPStan
phpstan:
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Vous retrouverez les ports dans le fichier `compose.override.yml`

Par défaut:
* Site AFUP : <https://localhost:9205/>
* Planète PHP : <https://localhost:9215/>
* Mailcatcher: <http://localhost:1181/>

_Les ports utilisés peuvent être modifiés dans le fichier `compose.override.yml`._
Expand Down Expand Up @@ -73,10 +72,7 @@ Lancement des tests fonctionnels :
```
./bin/behat
```
- Lancer les tests pour le site Planete PHP :
```
./bin/behat -c behat-planete.yml
```

- Une alternative est d'utiliser la commande `make test-functional`, attention cette commande arrête les containeurs de tests à la fin de l'exécution de la suite de test. Si par la suite vous souhaitez lancer un test, il faut bien penser à les allumer de nouveau.

Dans chacun des cas, il est possible de spécifier un test dans la ligne de commande. Exemple: `./bin/behat tests/behat/features/Admin/AdminFeuilles.feature`
Expand Down
18 changes: 0 additions & 18 deletions behat-planete.yml

This file was deleted.

5 changes: 0 additions & 5 deletions compose.override.yml-dist
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ services:
- "9205:80"
# environment:
# XDEBUG_CONFIG: "remote_connect_back=1 profiler_enable=1 remote_autostart=0 remote_enable=1"
planete:
ports:
- "9215:80"
environment:
AFUP_GLOBAL_MENU_PREFIX: 'https://localhost:9205'
mailcatcher:
ports:
- "1181:1080"
39 changes: 0 additions & 39 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,44 +66,6 @@ services:
dbtest:
condition: service_healthy

planete:
build:
context: ./docker/dockerfiles/planete
args:
uid: ${CURRENT_UID:-1001}
gid: "1001"
environment:
SYMFONY_ENV: "dev"
env_file:
.env
volumes:
- ./:/var/www/html
links:
- db
- mailcatcher

planetetest:
build:
context: ./docker/dockerfiles/planete
args:
uid: ${CURRENT_UID:-1001}
gid: "1001"
ENABLE_XDEBUG: ${ENABLE_XDEBUG:-false}
environment:
SYMFONY_ENV: "test"
env_file:
.env
volumes:
- ./:/var/www/html
healthcheck:
test: ["CMD", "curl", "-f", "https://planetetest:80"]
interval: 30s
timeout: 10s
retries: 5
depends_on:
dbtest:
condition: service_healthy

cliphp:
build:
context: ./docker/dockerfiles/apachephp
Expand All @@ -121,7 +83,6 @@ services:
- apachephp
- mailcatcher
- apachephptest
- planetetest
- dbtest
- statictestresources
command: "false"
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@
},
"classmap": [
"app/AppKernel.php",
"app/AppCache.php",
"planete/app/PlaneteAppKernel.php"
"app/AppCache.php"
],
"files": [
"sources/Afup/Bootstrap/_Common.php",
Expand Down
33 changes: 0 additions & 33 deletions docker/dockerfiles/planete/Dockerfile

This file was deleted.

19 changes: 0 additions & 19 deletions docker/dockerfiles/planete/apache.conf

This file was deleted.

35 changes: 0 additions & 35 deletions docker/dockerfiles/planete/apache.crt

This file was deleted.

51 changes: 0 additions & 51 deletions docker/dockerfiles/planete/apache.key

This file was deleted.

51 changes: 0 additions & 51 deletions htdocs/pages/planete/app.php

This file was deleted.

3 changes: 0 additions & 3 deletions htdocs/pages/planete/flux.php

This file was deleted.

3 changes: 0 additions & 3 deletions htdocs/pages/planete/index.php

This file was deleted.

3 changes: 0 additions & 3 deletions htdocs/pages/planete/rss.php

This file was deleted.

Loading

0 comments on commit ee7d30a

Please sign in to comment.