modifs.mineures sans commentaires

.composer.pman.yml

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

.idea/php.xml

@@ -58,6 +58,12 @@
       <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
       <path value="$PROJECT_DIR$/vendor/nulib/base" />
+      <path value="$PROJECT_DIR$/vendor/phpmailer/phpmailer" />
+      <path value="$PROJECT_DIR$/vendor/dflydev/dot-access-data" />
+      <path value="$PROJECT_DIR$/vendor/league/config" />
+      <path value="$PROJECT_DIR$/vendor/league/commonmark" />
+      <path value="$PROJECT_DIR$/vendor/nette/utils" />
+      <path value="$PROJECT_DIR$/vendor/nette/schema" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />

.pman.conf

@@ -1,25 +1,27 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 
-UPSTREAM=dev74
-DEVELOP=dev82
-FEATURE=wip82/
-RELEASE=rel82-
-MAIN=main82
+UPSTREAM=
+DEVELOP=dev74
+FEATURE=wip74/
+RELEASE=rel74-
+MAIN=main74
 TAG_PREFIX=
-TAG_SUFFIX=p82
-HOTFIX=hotf82-
+TAG_SUFFIX=p74
+HOTFIX=hotf74-
 DIST=
 NOAUTO=
 
 AFTER_CREATE_RELEASE='
 set -x
 pcomp-select_profile.php dist
+composer u || exit 1
 git commit -am "<pman>deps de dist"
 true
 '
 AFTER_MERGE_RELEASE='
 set -x
 pcomp-select_profile.php dev
+composer u || exit 1
 git commit -am "<pman>deps de dev"
 true
 '

.runphp.conf

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

README.md

@@ -62,6 +62,8 @@ git checkout dev74
 git cherry-pick "$commit"
 pp -a
 
+_merge82
+
 ## console 82
 
 pu

composer.json

@@ -3,6 +3,10 @@
 	"type": "library",
 	"description": "wrapper pour phpoffice/phpspreadsheet",
 	"repositories": [
+		{
+			"type": "path",
+			"url": "../nulib-base"
+		},
 		{
 			"type": "composer",
 			"url": "https://repos.univ-reunion.fr/composer"
@@ -15,12 +19,12 @@
 		}
 	},
 	"require": {
-		"nulib/base": "^0.8.0p82",
-		"phpoffice/phpspreadsheet": "^3.3.0",
-		"php": "^8.2"
+		"nulib/base": "^7.4-dev",
+		"phpoffice/phpspreadsheet": "^1.0",
+		"php": "^7.4"
 	},
 	"require-dev": {
-		"nulib/tests": "^8.2"
+		"nulib/tests": "^7.4"
 	},
 	"autoload": {
 		"psr-4": {