From 0e085f54db705b786f2a5fa58ff2f0867b034564 Mon Sep 17 00:00:00 2001
From: point <maxime.point2@etu.uca.fr>
Date: Tue, 14 Nov 2023 11:13:25 +0100
Subject: [PATCH] modif composer.json

---
 .idea/Php_RSS.iml                           |  4 ++++
 fluxRSS/composer.json                       |  6 ++++--
 fluxRSS/model/ArticleModel.php              |  6 +++---
 fluxRSS/vendor/composer/autoload_psr4.php   |  3 ++-
 fluxRSS/vendor/composer/autoload_static.php | 14 +++++++++++---
 fluxRSS/vendor/composer/installed.php       | 12 ++++++------
 6 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/.idea/Php_RSS.iml b/.idea/Php_RSS.iml
index 611ec76..8e3d230 100755
--- a/.idea/Php_RSS.iml
+++ b/.idea/Php_RSS.iml
@@ -5,6 +5,10 @@
       <sourceFolder url="file://$MODULE_DIR$/mvc_PSR4_twig/config" isTestSource="false" packagePrefix="config\" />
       <sourceFolder url="file://$MODULE_DIR$/mvc_PSR4_twig/controleur" isTestSource="false" packagePrefix="controleur\" />
       <sourceFolder url="file://$MODULE_DIR$/mvc_PSR4_twig/metier" isTestSource="false" packagePrefix="modeles\" />
+      <sourceFolder url="file://$MODULE_DIR$/fluxRSS/config" isTestSource="false" packagePrefix="config\" />
+      <sourceFolder url="file://$MODULE_DIR$/fluxRSS/controleur" isTestSource="false" packagePrefix="controleur\" />
+      <sourceFolder url="file://$MODULE_DIR$/fluxRSS/DAL" isTestSource="false" packagePrefix="DAL\" />
+      <sourceFolder url="file://$MODULE_DIR$/fluxRSS/model" isTestSource="false" packagePrefix="model\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/twig/twig" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
diff --git a/fluxRSS/composer.json b/fluxRSS/composer.json
index 21ca7cc..c8a5778 100644
--- a/fluxRSS/composer.json
+++ b/fluxRSS/composer.json
@@ -2,13 +2,15 @@
   "require": {
     "twig/twig": "^3.0",
     "ext-pdo": "*",
-    "ext-dom": "*"
+    "ext-dom": "*",
+    "ext-apcu": "*"
   },
   "autoload": {
     "psr-4": {
       "controleur\\": "controleur/",
       "config\\": "config/",
-      "modeles\\": "metier/"
+      "model\\": "model/",
+      "DAL\\": "DAL/"
     }
   }
 }
diff --git a/fluxRSS/model/ArticleModel.php b/fluxRSS/model/ArticleModel.php
index 55a73ae..e7755e1 100755
--- a/fluxRSS/model/ArticleModel.php
+++ b/fluxRSS/model/ArticleModel.php
@@ -2,13 +2,13 @@
 
 namespace model;
 
-use DAL;
+use DAL\{ArticleGateway, Connection};
 use metier;
-class ArticleModel
+class  ArticleModel
 {
     public static function getArticles() : array
     {
-        $gwArticle = new DAL\ArticleGateway(new DAL\Connection('mysql:host = localhost; dbname = dbrorossetto', 'rorossetto', 'tpphp'));
+        $gwArticle = new ArticleGateway(new Connection('mysql:host = localhost; dbname = dbrorossetto', 'rorossetto', 'tpphp'));
         $res = $gwArticle->getAllArticles();
         foreach($res as $row){
             $tabArticle[] = new metier\Article($row['id'], $row['title'],$row['datePub'],$row['description'],$row['guid'],$row['link'],$row['mediaContent'],$row['provenance'] );
diff --git a/fluxRSS/vendor/composer/autoload_psr4.php b/fluxRSS/vendor/composer/autoload_psr4.php
index abb6bf8..e908ee3 100644
--- a/fluxRSS/vendor/composer/autoload_psr4.php
+++ b/fluxRSS/vendor/composer/autoload_psr4.php
@@ -6,10 +6,11 @@ $vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    'modeles\\' => array($baseDir . '/modeles'),
+    'model\\' => array($baseDir . '/model'),
     'controleur\\' => array($baseDir . '/controleur'),
     'config\\' => array($baseDir . '/config'),
     'Twig\\' => array($vendorDir . '/twig/twig/src'),
     'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
+    'DAL\\' => array($baseDir . '/DAL'),
 );
diff --git a/fluxRSS/vendor/composer/autoload_static.php b/fluxRSS/vendor/composer/autoload_static.php
index dc37466..716819b 100644
--- a/fluxRSS/vendor/composer/autoload_static.php
+++ b/fluxRSS/vendor/composer/autoload_static.php
@@ -14,7 +14,7 @@ class ComposerStaticInita6287a55fe354aae4af95d1e4395c915
     public static $prefixLengthsPsr4 = array (
         'm' => 
         array (
-            'modeles\\' => 8,
+            'model\\' => 6,
         ),
         'c' => 
         array (
@@ -30,12 +30,16 @@ class ComposerStaticInita6287a55fe354aae4af95d1e4395c915
             'Symfony\\Polyfill\\Mbstring\\' => 26,
             'Symfony\\Polyfill\\Ctype\\' => 23,
         ),
+        'D' => 
+        array (
+            'DAL\\' => 4,
+        ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'modeles\\' => 
+        'model\\' => 
         array (
-            0 => __DIR__ . '/../..' . '/modeles',
+            0 => __DIR__ . '/../..' . '/model',
         ),
         'controleur\\' => 
         array (
@@ -57,6 +61,10 @@ class ComposerStaticInita6287a55fe354aae4af95d1e4395c915
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
         ),
+        'DAL\\' => 
+        array (
+            0 => __DIR__ . '/../..' . '/DAL',
+        ),
     );
 
     public static $classMap = array (
diff --git a/fluxRSS/vendor/composer/installed.php b/fluxRSS/vendor/composer/installed.php
index a25b246..cd7eed8 100644
--- a/fluxRSS/vendor/composer/installed.php
+++ b/fluxRSS/vendor/composer/installed.php
@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => '1.0.0+no-version-set',
-        'version' => '1.0.0.0',
-        'reference' => NULL,
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'reference' => 'd63486a4ad71ad2db8e8b98f744918ca6a15db9e',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => '1.0.0+no-version-set',
-            'version' => '1.0.0.0',
-            'reference' => NULL,
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
+            'reference' => 'd63486a4ad71ad2db8e8b98f744918ca6a15db9e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),