autoload avec composer

16 files changed, 86 insertions, 66 deletions

diff --git a/composer.json b/composer.json
index 667a525..f77b776 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,6 @@
         "symfony/cache": "^7.1"
     },
         "autoload": {
-         "psr-0": {"": "src/"}
+        "classmap": ["src"]
      }
 }
diff --git a/src/model/version 0.1/CESU.php b/old/model version 0.1/CESU.php
index 2768b8f..2768b8f 100644
--- a/src/model/version 0.1/CESU.php
+++ b/old/model version 0.1/CESU.php
diff --git a/src/model/version 0.1/Clients.php b/old/model version 0.1/Clients.php
index 32cf0c5..32cf0c5 100644
--- a/src/model/version 0.1/Clients.php
+++ b/old/model version 0.1/Clients.php
diff --git a/src/model/version 0.1/DB.php b/old/model version 0.1/DB.php
index 47407ba..47407ba 100644
--- a/src/model/version 0.1/DB.php
+++ b/old/model version 0.1/DB.php
diff --git a/src/model/version 0.1/DevisFactures.php b/old/model version 0.1/DevisFactures.php
index 06a0a59..06a0a59 100644
--- a/src/model/version 0.1/DevisFactures.php
+++ b/old/model version 0.1/DevisFactures.php
diff --git a/src/model/version 0.1/Locations.php b/old/model version 0.1/Locations.php
index c6b8deb..c6b8deb 100644
--- a/src/model/version 0.1/Locations.php
+++ b/old/model version 0.1/Locations.php
diff --git a/src/model/version 0.1/Model.php b/old/model version 0.1/Model.php
index b3d157d..b3d157d 100644
--- a/src/model/version 0.1/Model.php
+++ b/old/model version 0.1/Model.php
diff --git a/src/model/version 0.1/Prestations.php b/old/model version 0.1/Prestations.php
index 18bc787..18bc787 100644
--- a/src/model/version 0.1/Prestations.php
+++ b/old/model version 0.1/Prestations.php
diff --git a/src/model/version 0.1/StructTablesDB.php b/old/model version 0.1/StructTablesDB.php
index 303af46..303af46 100644
--- a/src/model/version 0.1/StructTablesDB.php
+++ b/old/model version 0.1/StructTablesDB.php
diff --git a/src/Config.php b/src/Config.php
index 16aa8ed..5de966f 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -4,26 +4,23 @@
 class Config

 {

     // valeurs par défaut au cas où
-    static public $business_name = 'ORDIPOLO';

-    static public $business_guy = 'Paul Jusot';

-    static public $business_address = "2A rue de l'île de Man";

-    static public $business_postcode = '29000';

-    static public $business_city = 'Quimper';

-    static public $db_name = "ordipolo";

-    static public $db_path = 'data/';

-    static public $latex_path = 'data/latex/';

-    static public $pdf_path = 'data/pdf/';

-    static public $pub_path = "pub/";

-    static public $flyer = "flyer.xcf";

-    static public $business_card = "carte.sla";

-    static public $image_editor = 'gimp';

-    static public $publishing = 'scribus';

-    static public $sgbd = 'sqlite';

-    static public $sqlite_gui = 'sqlitebrowser'; // ne pas utiliser si le sgbd n'est pas sqlite

-    static public $date_format = 'euro';

-    

-    // pour que Config crée le dsn: Data Source Name (à mettre dans une autre classe!)

-    //~ static public $dsn = '';

+    static public string $business_name = 'ORDIPOLO';

+    static public string $business_guy = 'Paul Jusot';

+    static public string $business_address = "2A rue de l'île de Man";

+    static public string $business_postcode = '29000';

+    static public string $business_city = 'Quimper';

+    static public string $db_name = "ordipolo";

+    static public string $db_path = 'data/';

+    static public string $latex_path = 'data/latex/';

+    static public string $pdf_path = 'data/pdf/';

+    static public string $pub_path = "pub/";

+    static public string $flyer = "flyer.xcf";

+    static public string $business_card = "carte.sla";

+    static public string $image_editor = 'gimp';

+    static public string $publishing = 'scribus';

+    static public string $sgbd = 'sqlite';

+    static public string $sqlite_gui = 'sqlitebrowser'; // ne pas utiliser si le sgbd n'est pas sqlite

+    static public string $date_format = 'euro';

     

     // ça pourrait être bien de founir sqlite avec l'application pour supprimer une dépendance

     //~ static public $sqliteBin = 'lib/sqlite_linux';

diff --git a/src/files.php b/src/files.php
index ad20ee0..2a68d9d 100644
--- a/src/files.php
+++ b/src/files.php
@@ -25,11 +25,6 @@ function makeFile($path, $file_name, $data)
     //~ }

 }

 

-//~ function deleteFile($path, $file_name)

-//~ {
-    //~ unlink()
-//~ }

-

 function makeFolder(string $path)

 {

     $rights = 0755; // droits en octal

diff --git a/src/main.php b/src/main.php
index 45f6c43..ded3248 100644
--- a/src/main.php
+++ b/src/main.php
@@ -1,17 +1,18 @@
 <?php
 // src/main.php
 
-//require('model/File.php'); // utilité d'une classe File?
-require 'src/files.php';
+require_once 'vendor/autoload.php';
 
 // configuration de l'utilisateur
-require 'src/Config.php'; // lit le config.ini et gère certaines erreurs (exemple les / aux chemins manquants)
+//~ require 'src/Config.php'; // lit le config.ini et gère certaines erreurs (exemple les / aux chemins manquants)
 Config::readFile('config/config.ini');
 Config::hydrate();
 // et à coder peut-être plus tard
 //require('config_window.php'); // configuration user-friendly et assistée avec des messages d'erreur et des indications
 
 // création du dossier data et sous-dossiers
+//require('model/File.php'); // utilité d'une classe File?
+require 'src/files.php';
 makeFolder(Config::$db_path);
 makeFolder(Config::$latex_path);
 makeFolder(Config::$pdf_path);
@@ -27,17 +28,12 @@ $sqlite_cli = ''; // commande sqlite ou sqlite3
 $x_term_command = ''; // commande terminal en mode graphique
 
 require 'src/dependances.php'; // vérification des dépendances
-require 'src/Dates.php'; // gère dates et timestamps
+//~ require 'src/Dates.php'; // gère dates et timestamps
 Dates::$date_format = Config::$date_format; // dates européennes ou américaines
 
 // entités doctrine
-require 'src/model/doctrine-bootstrap.php';
-include 'src/model/entities/Client.php';
-include 'src/model/entities/Prestation.php';
-include 'src/model/entities/Devis.php';
-include 'src/model/entities/Facture.php';
-include 'src/model/entities/CESU.php';
-include 'src/model/entities/Location.php';
+require 'src/model/doctrine-bootstrap.php'; // contient aussi un autoloader spécial pour les entités
+// le require_once 'vendor/autoload.php'; doit être situé AVANT cette ligne pour être exécuté en second
 
 // utiliser plus tard de nouvelles classes Manager au lieu des entités
 // ET les faire hériter d'un unique parent
@@ -49,27 +45,9 @@ CESU::$entityManager = $entityManager;
 Location::$entityManager = $entityManager;
 
 require 'src/functions.php';
-
-
-/*require('src/model/DB.php'); // connexion en héritant de PDO
-// création du DSN à mettre ailleurs (dans Model?)
-DB::$dsn = 'sqlite:' . Config::$db_path; // Data Source Name = 1er paramètre du constructeur de PDO: $bdd = new PDO($dsn);
-
-require('src/model/Model.php'); // class Model extends DB, requêtes SQL
-require('src/model/StructTablesDB.php');
-Model::createTables();
-
-require('src/model/Clients.php');
-require('src/model/Prestations.php');
-require('src/model/DevisFactures.php');
-require('src/model/CESU.php');
-require('src/model/Locations.php');*/
-
-
-require 'src/view/Zenity.php'; // générer ler commandes système zenity
-require 'src/view/ZenitySetup.php'; // texte dans les fenêtres ET instanciation (un objet = une commande)
-
-require 'src/Latex.php'; // générer le code LaTeX
+//~ require 'src/view/Zenity.php'; // générer ler commandes système zenity
+//~ require 'src/view/ZenitySetup.php'; // texte dans les fenêtres ET instanciation (un objet = une commande)
+//~ require 'src/Latex.php'; // générer le code LaTeX
 
 // boucle principale
 require 'src/sections/1_customer.php';
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 778aaf6..b528832 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,7 +6,35 @@ $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
+    'BilanLatex' => $baseDir . '/src/Latex.php',
+    'CESU' => $baseDir . '/src/model/entities/CESU.php',
+    'Client' => $baseDir . '/src/model/entities/Client.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+    'ComptaLatex' => $baseDir . '/src/Latex.php',
+    'Config' => $baseDir . '/src/Config.php',
+    'Dates' => $baseDir . '/src/Dates.php',
+    'Devis' => $baseDir . '/src/model/entities/Devis.php',
+    'DevisLatex' => $baseDir . '/src/Latex.php',
+    'EnveloppeRectoLatex' => $baseDir . '/src/Latex.php',
+    'EnveloppeVersoLatex' => $baseDir . '/src/Latex.php',
+    'Facture' => $baseDir . '/src/model/entities/Facture.php',
+    'FactureLatex' => $baseDir . '/src/Latex.php',
+    'File' => $baseDir . '/src/model/File.php',
+    'Latex' => $baseDir . '/src/Latex.php',
+    'LivreRecettesLatex' => $baseDir . '/src/Latex.php',
+    'Location' => $baseDir . '/src/model/entities/Location.php',
+    'LocationLatex' => $baseDir . '/src/Latex.php',
     'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+    'PrestaLatex' => $baseDir . '/src/Latex.php',
+    'Prestation' => $baseDir . '/src/model/entities/Prestation.php',
+    'RegistreAchatsLatex' => $baseDir . '/src/Latex.php',
+    'ZenityCalendar' => $baseDir . '/src/view/Zenity.php',
+    'ZenityCmd' => $baseDir . '/src/view/Zenity.php',
+    'ZenityEntry' => $baseDir . '/src/view/Zenity.php',
+    'ZenityForms' => $baseDir . '/src/view/Zenity.php',
+    'ZenityList' => $baseDir . '/src/view/Zenity.php',
+    'ZenityQuestion' => $baseDir . '/src/view/Zenity.php',
+    'ZenitySetup' => $baseDir . '/src/view/ZenitySetup.php',
+    'latexToPdf' => $baseDir . '/src/model/File.php',
     '©' => $vendorDir . '/symfony/cache/Traits/ValueWrapper.php',
 );
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 6c0bc99..15a2ff3 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,5 +6,4 @@ $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    '' => array($baseDir . '/src'),
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index c034123..94221b8 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -140,13 +140,37 @@ class ComposerStaticInit06b3b9cb1cc1409798fdff35c860a254
         ),
     );
 
-    public static $fallbackDirsPsr0 = array (
-        0 => __DIR__ . '/../..' . '/src',
-    );
-
     public static $classMap = array (
+        'BilanLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'CESU' => __DIR__ . '/../..' . '/src/model/entities/CESU.php',
+        'Client' => __DIR__ . '/../..' . '/src/model/entities/Client.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+        'ComptaLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'Config' => __DIR__ . '/../..' . '/src/Config.php',
+        'Dates' => __DIR__ . '/../..' . '/src/Dates.php',
+        'Devis' => __DIR__ . '/../..' . '/src/model/entities/Devis.php',
+        'DevisLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'EnveloppeRectoLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'EnveloppeVersoLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'Facture' => __DIR__ . '/../..' . '/src/model/entities/Facture.php',
+        'FactureLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'File' => __DIR__ . '/../..' . '/src/model/File.php',
+        'Latex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'LivreRecettesLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'Location' => __DIR__ . '/../..' . '/src/model/entities/Location.php',
+        'LocationLatex' => __DIR__ . '/../..' . '/src/Latex.php',
         'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
+        'PrestaLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'Prestation' => __DIR__ . '/../..' . '/src/model/entities/Prestation.php',
+        'RegistreAchatsLatex' => __DIR__ . '/../..' . '/src/Latex.php',
+        'ZenityCalendar' => __DIR__ . '/../..' . '/src/view/Zenity.php',
+        'ZenityCmd' => __DIR__ . '/../..' . '/src/view/Zenity.php',
+        'ZenityEntry' => __DIR__ . '/../..' . '/src/view/Zenity.php',
+        'ZenityForms' => __DIR__ . '/../..' . '/src/view/Zenity.php',
+        'ZenityList' => __DIR__ . '/../..' . '/src/view/Zenity.php',
+        'ZenityQuestion' => __DIR__ . '/../..' . '/src/view/Zenity.php',
+        'ZenitySetup' => __DIR__ . '/../..' . '/src/view/ZenitySetup.php',
+        'latexToPdf' => __DIR__ . '/../..' . '/src/model/File.php',
         '©' => __DIR__ . '/..' . '/symfony/cache/Traits/ValueWrapper.php',
     );
 
@@ -155,7 +179,6 @@ class ComposerStaticInit06b3b9cb1cc1409798fdff35c860a254
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit06b3b9cb1cc1409798fdff35c860a254::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit06b3b9cb1cc1409798fdff35c860a254::$prefixDirsPsr4;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit06b3b9cb1cc1409798fdff35c860a254::$fallbackDirsPsr0;
             $loader->classMap = ComposerStaticInit06b3b9cb1cc1409798fdff35c860a254::$classMap;
 
         }, null, ClassLoader::class);
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index d279dee..b15bdeb 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '94d67a4b51f8e62e7d518cce26a526ae1ec48278',
+        'reference' => 'bf6655a534a6775d30cafa67bd801276bda1d98d',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '94d67a4b51f8e62e7d518cce26a526ae1ec48278',
+            'reference' => 'bf6655a534a6775d30cafa67bd801276bda1d98d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),