Compare commits

..

No commits in common. "dev82" and "dev74" have entirely different histories.
dev82 ... dev74

5 changed files with 663 additions and 334 deletions

View File

@ -5,8 +5,8 @@ composer:
dev: dev:
link: true link: true
require: require:
nulib/php: ^8.2-dev nulib/php: ^7.4-dev
dist: dist:
link: false link: false
require: require:
nulib/php: ^0.4.0p82 nulib/php: ^0.4.0p74

View File

@ -1,13 +1,13 @@
# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
UPSTREAM=dev74 UPSTREAM=
DEVELOP=dev82 DEVELOP=dev74
FEATURE=wip82/ FEATURE=wip74/
RELEASE=rel82- RELEASE=rel74-
MAIN=dist82 MAIN=dist74
TAG_PREFIX= TAG_PREFIX=
TAG_SUFFIX=p82 TAG_SUFFIX=p74
HOTFIX=hotf82- HOTFIX=hotf74-
DIST= DIST=
NOAUTO= NOAUTO=

View File

@ -4,5 +4,5 @@
RUNPHP= RUNPHP=
# Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies # Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies
DIST=d12 DIST=d11
#REGISTRY=pubdocker.univ-reunion.fr/dist #REGISTRY=pubdocker.univ-reunion.fr/dist

View File

@ -19,12 +19,12 @@
} }
}, },
"require": { "require": {
"nulib/php": "^8.2-dev", "nulib/php": "^7.4-dev",
"phpoffice/phpspreadsheet": "^3.3.0", "phpoffice/phpspreadsheet": "^1.0",
"php": "^8.2" "php": "^7.4"
}, },
"require-dev": { "require-dev": {
"nulib/tests": "^8.2" "nulib/tests": "^7.4"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

969
composer.lock generated

File diff suppressed because it is too large Load Diff