Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1fbb07d
Rely on php-scoper's phar instead of docker
cdesiles Aug 12, 2024
343eed7
Ignore php-scoper phar and MAC stuff
cdesiles Aug 12, 2024
1db134f
Update composer's lockfile
cdesiles Aug 12, 2024
8d10255
En avant
cdesiles Aug 13, 2024
7c3c9b4
Move to pnpm
cdesiles Aug 23, 2024
ef17e49
Make zip is easier te remember
cdesiles Aug 23, 2024
329a5af
Much better this way
cdesiles Aug 23, 2024
382294d
Better inner documentation
cdesiles Aug 23, 2024
9607355
Going even further down the line
cdesiles Aug 23, 2024
53c0388
Reset to 0.0.0
cdesiles Aug 27, 2024
04c1753
Remove space
cdesiles Aug 27, 2024
403f8c6
Tidying _dev
cdesiles Aug 27, 2024
a79c4b4
Remove old docker stuff
cdesiles Aug 27, 2024
89bfbc4
Docker cleanup
cdesiles Aug 27, 2024
b9bf06a
Makefile fixes
cdesiles Aug 27, 2024
9b7b056
Go on
cdesiles Aug 29, 2024
6882091
hop
cdesiles Aug 29, 2024
bba68a8
Hop
cdesiles Aug 30, 2024
3767bfb
Paf
cdesiles Aug 30, 2024
4428d14
Zou
cdesiles Aug 30, 2024
741430a
Simplify packaging
cdesiles Aug 30, 2024
3d0b80d
Good to go
cdesiles Aug 30, 2024
6015cdd
Update codeowners
cdesiles Aug 30, 2024
1694f1e
Almost there
cdesiles Aug 30, 2024
356ff87
do not need this
cdesiles Aug 30, 2024
22146d9
test this
cdesiles Aug 30, 2024
e60d804
Yop
cdesiles Aug 30, 2024
69b1cb3
Update doc
cdesiles Aug 30, 2024
30d5dad
What about this?
cdesiles Aug 30, 2024
7b58921
Try my best
cdesiles Aug 30, 2024
5c9d20a
Add note
cdesiles Oct 21, 2024
f27218b
Merge branch 'main' into fix/make-packaging
cdesiles Oct 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ composer-dev.json
composer-dev.lock
.env

### PHP Scoper ###
php-scoper.phar

# Mac OS
.DS_Store

### PHPUnit ###
.phpunit.result.cache

Expand Down
18 changes: 8 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,13 @@ PHP_SCOPER_VENDOR_DIRS = $(shell cat scoper.inc.php | grep 'dirScoped =' | sed '
PHP_SCOPER_OUTPUT_DIR := vendor-scoped
PHP_SCOPER_VERSION := 0.18.11

php-scoper-list:
@echo "${PHP_SCOPER_VENDOR_DIRS}"
php-scoper.phar:
curl -s -f -L -O "https://github.com/humbug/php-scoper/releases/download/${PHP_SCOPER_VERSION}/php-scoper.phar"
chmod +x php-scoper.phar

php-scoper-pull:
docker pull humbugphp/php-scoper:${PHP_SCOPER_VERSION}

php-scoper-add-prefix: scoper.inc.php vendor-clean vendor php-scoper-pull
docker run -v ${PWD}:/input -w /input -u ${CURRENT_UID}:${CURRENT_GID} \
humbugphp/php-scoper:${PHP_SCOPER_VERSION} add-prefix --output-dir ${PHP_SCOPER_OUTPUT_DIR} --force --quiet
php-scoper-add-prefix: php-scoper.phar scoper.inc.php vendor-clean vendor
./php-scoper.phar add-prefix --output-dir ${PHP_SCOPER_OUTPUT_DIR} --force --quiet
ls ${PHP_SCOPER_OUTPUT_DIR}
#for d in ${VENDOR_DIRS}; do rm -rf ./vendor/$$d && mv ./${SCOPED_DIR}/$$d ./vendor/; done;
$(foreach DIR,$(PHP_SCOPER_VENDOR_DIRS), rm -rf "./vendor/${DIR}" && mv "./${PHP_SCOPER_OUTPUT_DIR}/${DIR}" ./vendor/;)
rmdir "./${PHP_SCOPER_OUTPUT_DIR}"
Expand Down Expand Up @@ -262,8 +260,8 @@ build-front: ${BUNDLE_JS}
composer.phar:
./scripts/composer-install.sh

#clean:
# git -c core.excludesfile=/dev/null clean -X -d -f
clean:
git -c core.excludesfile=/dev/null clean -X -d -f

#######
# TOOLS
Expand Down
Loading