Merge branch 'pre-master' of https://codefirst.iut.uca.fr/git/roxane.rossetto/Php_RSS into pre-master

.idea/Php_RSS.iml

@@ -2,10 +2,17 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
+      <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\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/twig/twig" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
+      <excludeFolder url="file://$MODULE_DIR$/mvc_PSR4_twig/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/mvc_PSR4_twig/vendor/symfony/polyfill-ctype" />
+      <excludeFolder url="file://$MODULE_DIR$/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring" />
+      <excludeFolder url="file://$MODULE_DIR$/mvc_PSR4_twig/vendor/twig/twig" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/php.xml

@@ -1,14 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
   <component name="PhpIncludePathManager">
     <include_path>
       <path value="$PROJECT_DIR$/vendor/composer" />
       <path value="$PROJECT_DIR$/vendor/twig/twig" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/mvc_PSR4_twig/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/mvc_PSR4_twig/vendor/composer" />
+      <path value="$PROJECT_DIR$/mvc_PSR4_twig/vendor/twig/twig" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
 </project>

fluxRSS/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

fluxRSS/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/mvc_PSR4_twig.iml" filepath="$PROJECT_DIR$/.idea/mvc_PSR4_twig.iml" />
+    </modules>
+  </component>
+</project>

fluxRSS/.idea/mvc_PSR4_twig.iml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/config" isTestSource="false" packagePrefix="config\" />
+      <sourceFolder url="file://$MODULE_DIR$/controleur" isTestSource="false" packagePrefix="controleur\" />
+      <sourceFolder url="file://$MODULE_DIR$/metier" isTestSource="false" packagePrefix="modeles\" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/twig/twig" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

fluxRSS/.idea/php.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/twig/twig" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
+    <option name="suggestChangeDefaultLanguageLevel" value="false" />
+  </component>
+</project>

fluxRSS/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

fluxRSS/DAL/ArticleGateway.php

@@ -0,0 +1,25 @@
+<?php
+namespace DAL;
+
+use App\modeles\Article;
+use PDO;
+class ArticleGateway
+{
+    private $con;
+
+    /**
+     * @param $con
+     */
+    public function __construct($con)
+    {
+        $this->con = $con;
+    }
+
+    public function getAllArticles():array
+    {
+        $query = 'SELECT * FROM Article;';
+        $this->con->executeQuery($query, array());
+        return $this->con->getResults();
+    }
+
+}

fluxRSS/DAL/Connection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace modeles;
+namespace DAL;
 
 use PDO;
 

fluxRSS/DAL/FluxGateway.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace modeles;
+namespace DAL;
 
 use PDO;
 

fluxRSS/composer.json

@@ -7,7 +7,7 @@
     "psr-4": {
       "controleur\\": "controleur/",
       "config\\": "config/",
-      "modeles\\": "modeles/"
+      "modeles\\": "metier/"
     }
   }
 }

fluxRSS/controleur/Controleur.php

@@ -1,14 +1,15 @@
 <?php
 namespace controleur;
 
+use model\ArticleModel;
+
 class Controleur
 {
     public function __construct()
     {
         global $twig; // nécessaire pour utiliser variables globales
-        // on démarre ou reprend la session pas utilisée ici
         session_start();
-
+        $tabArticle[] = ArticleModel::getArticles();
         //debut
 
         //on initialise un tableau d'erreur
@@ -30,7 +31,8 @@ class Controleur
                     //mauvaise action
                 default:
                     $dVueEreur[] = "Erreur d'appel php";
-                    echo $twig->render('vuephp1.html', ['dVueEreur' => $dVueEreur]);
+                    $dataview = ['Article'=> $tabArticle];
+                    echo $twig->render('listArticle.html', ['tabArticle' => $dataview, 'dVueErreur'=>$dVueEreur]);
                     break;
             }
         } catch (\PDOException $e) {
@@ -67,7 +69,7 @@ class Controleur
         $age = $_POST['txtAge'];
         \config\Validation::val_form($nom, $age, $dVueEreur);
 
-        $model = new \modeles\Simplemodel();
+        $model = new \metier\Simplemodel();
         $data  = $model->get_data();
 
         $dVue = [

fluxRSS/index.php

@@ -10,7 +10,7 @@ use controleur\Controleur;
 //twig
 $loader = new \Twig\Loader\FilesystemLoader('templates');
 $twig   = new \Twig\Environment($loader, [
-    'cache' => 'cache',
+    'cache' => false,
 ]);
 
 $cont = new Controleur();

fluxRSS/metier/Article.php

@@ -1,127 +1,118 @@
 <?php
 
-namespace modeles;
+namespace metier;
 
 class Article
 {
+    private int $id;
     private string $title;
     private string $date;
     private string $description;
     private string $guid;
     private string $link;
     private string $mediaContent;
+    private int $provenance;
 
     /**
+     * @param int $id
      * @param string $title
      * @param string $date
      * @param string $description
      * @param string $guid
      * @param string $link
      * @param string $mediaContent
+     * @param int $provenance
      */
-    public function __construct(string $title, string $date, string $description, string $guid, string $link, string $mediaContent)
+    public function __construct(int $id, string $title, string $date, string $description, string $guid, string $link, string $mediaContent, int $provenance)
     {
+        $this->id = $id;
         $this->title = $title;
         $this->date = $date;
         $this->description = $description;
         $this->guid = $guid;
         $this->link = $link;
         $this->mediaContent = $mediaContent;
+        $this->provenance = $provenance;
+    }
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function setId(int $id): void
+    {
+        $this->id = $id;
     }
 
-    /**
-     * @return string
-     */
     public function getTitle(): string
     {
         return $this->title;
     }
 
-    /**
-     * @param string $title
-     */
     public function setTitle(string $title): void
     {
         $this->title = $title;
     }
 
-    /**
-     * @return string
-     */
     public function getDate(): string
     {
         return $this->date;
     }
 
-    /**
-     * @param string $date
-     */
     public function setDate(string $date): void
     {
         $this->date = $date;
     }
 
-    /**
-     * @return string
-     */
     public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * @param string $description
-     */
     public function setDescription(string $description): void
     {
         $this->description = $description;
     }
 
-    /**
-     * @return string
-     */
     public function getGuid(): string
     {
         return $this->guid;
     }
 
-    /**
-     * @param string $guid
-     */
     public function setGuid(string $guid): void
     {
         $this->guid = $guid;
     }
 
-    /**
-     * @return string
-     */
     public function getLink(): string
     {
         return $this->link;
     }
 
-    /**
-     * @param string $link
-     */
     public function setLink(string $link): void
     {
         $this->link = $link;
     }
 
-    /**
-     * @return string
-     */
     public function getMediaContent(): string
     {
         return $this->mediaContent;
     }
 
-    /**
-     * @param string $mediaContent
-     */
     public function setMediaContent(string $mediaContent): void
     {
         $this->mediaContent = $mediaContent;
     }
+
+    public function getProvenance(): int
+    {
+        return $this->provenance;
+    }
+
+    public function setProvenance(int $provenance): void
+    {
+        $this->provenance = $provenance;
+    }
+
 }

fluxRSS/metier/Flux.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace modeles;
+namespace metier;
 
 class Flux
 {

fluxRSS/model/ArticleModel.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace model;
+
+use DAL;
+use metier;
+class ArticleModel
+{
+    public static function getArticles() : array
+    {
+        $gwArticle = new DAL\ArticleGateway(new DAL\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'] );
+        }
+        return $tabArticle;
+    }
+}

fluxRSS/model/FluxModel.php

@@ -1,10 +1,17 @@
 <?php
 
-namespace modeles;
+namespace model;
+
+use DAL\FluxGateway;
+use metier\Flux;
 
 class FluxModel
 {
     private FluxGateway $gateway;
+
+    public function __construct(FluxGateway $fluxGateway){
+        $this->gateway = $fluxGateway;
+    }
     public function FindAllFlux(){
         $data = array();
         $result = $this->gateway->findAllFlux();
@@ -17,7 +24,7 @@ class FluxModel
 
     public function addFlux(Flux $flux)
     {
-        $data = findFlux($flux);
+        $data = $this->findFlux($flux);
         if ($data == array()) {
             $this->gateway->addFlux($flux);
         }

fluxRSS/templates/listArticle.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>All Articles</title>
+</head>
+<body>
+{% for value in tabArticle.Article %}
+    <p>{{value}}</p>
+{% endfor %}
+</body>
+</html>