François il y a 6 ans
Parent
commit
d1d28607ea

+ 109 - 162
.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="3c5ee217-7f14-4e90-abcb-4d394d69ee22" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Resources/views/layout.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/app/Resources/views/layout.html.twig" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DocumentBundle/Classe/Livre.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Classe/Bouquin.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DocumentBundle/Controller/DocumentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Controller/DocumentController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -33,13 +35,13 @@
     <session id="-2018136908">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="5" />
+          <entry key="project.closed" value="7" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.open.time.11" value="3" />
-          <entry key="project.open.time.12" value="1" />
+          <entry key="project.open.time.12" value="3" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="7" />
+          <entry key="project.opened" value="9" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
@@ -49,10 +51,10 @@
           <entry key="html" value="2" />
           <entry key="ico" value="1" />
           <entry key="log" value="1" />
-          <entry key="php" value="35" />
+          <entry key="php" value="37" />
           <entry key="png" value="1" />
-          <entry key="twig" value="15" />
-          <entry key="yml" value="18" />
+          <entry key="twig" value="16" />
+          <entry key="yml" value="20" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
@@ -60,32 +62,32 @@
           <entry key="CSS" value="1" />
           <entry key="HTML" value="2" />
           <entry key="Image" value="2" />
-          <entry key="PHP" value="27" />
+          <entry key="PHP" value="29" />
           <entry key="PLAIN_TEXT" value="9" />
-          <entry key="Twig" value="15" />
-          <entry key="YAML" value="18" />
+          <entry key="Twig" value="16" />
+          <entry key="YAML" value="20" />
           <entry key="htaccess" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="css" value="30" />
-          <entry key="dummy" value="18" />
+          <entry key="dummy" value="26" />
           <entry key="html" value="2" />
-          <entry key="php" value="4082" />
-          <entry key="twig" value="1853" />
+          <entry key="php" value="4281" />
+          <entry key="twig" value="1976" />
           <entry key="txt" value="1" />
-          <entry key="yml" value="199" />
+          <entry key="yml" value="264" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="CSS" value="30" />
           <entry key="HTML" value="2" />
-          <entry key="PHP" value="3268" />
-          <entry key="PLAIN_TEXT" value="833" />
-          <entry key="Twig" value="1853" />
-          <entry key="YAML" value="199" />
+          <entry key="PHP" value="3467" />
+          <entry key="PLAIN_TEXT" value="841" />
+          <entry key="Twig" value="1976" />
+          <entry key="YAML" value="264" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
@@ -105,91 +107,82 @@
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/DocumentController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
-              <folding>
-                <element signature="e#45#77#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="225">
+              <caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/DefaultController.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
+            <state relative-caret-position="45">
+              <caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
               <folding>
                 <element signature="e#45#102#0#PHP" expanded="true" />
+                <element signature="e#477#513#0#PHP" expanded="true" />
+                <element signature="e#821#843#1#PHP" expanded="true" />
+                <element signature="e#848#884#0#PHP" expanded="true" />
+                <element signature="e#1067#1106#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/derniers.html.twig">
+        <entry file="file://$PROJECT_DIR$/app/config/config.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="19" selection-start-column="19" selection-end-column="19" />
+            <state relative-caret-position="600">
+              <caret line="40" column="9" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/index.html.twig">
+        <entry file="file://$PROJECT_DIR$/app/config/parameters.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
-              <folding>
-                <element signature="e#13#31#0#Twig" expanded="true" />
-              </folding>
+            <state relative-caret-position="180">
+              <caret line="12" selection-start-line="12" selection-end-line="12" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
+        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Classe/Bouquin.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="31" lean-forward="true" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+            <state relative-caret-position="-31">
+              <caret line="20" column="39" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
               <folding>
-                <element signature="e#13#29#0#Twig" expanded="true" />
-                <element signature="e#107#126#0#HTML" expanded="true" />
-                <element signature="e#212#246#0#Twig" expanded="true" />
+                <element signature="e#6#88#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
+        <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="3" column="32" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="32" />
+            <state relative-caret-position="420">
+              <caret line="28" column="12" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/Resources/views/layout.html.twig">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" column="91" selection-start-line="4" selection-start-column="91" selection-end-line="4" selection-end-column="91" />
+            <state relative-caret-position="405">
+              <caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/web/bundles/DocumentBundle/assets/css/style.css">
+        <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
+            <state relative-caret-position="45">
+              <caret line="3" column="32" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="32" />
             </state>
           </provider>
         </entry>
@@ -224,7 +217,6 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/AppBundle/Controller/DefaultController.php" />
-        <option value="$PROJECT_DIR$/app/config/parameters.yml" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Controller/DefaultController.php" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Default/index.html.twig" />
         <option value="$PROJECT_DIR$/app/config/security.yml" />
@@ -234,19 +226,21 @@
         <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/config/services.yml" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Twig/MonTwig.php" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Twig/MonTwigExtension.php" />
-        <option value="$PROJECT_DIR$/src/DocumentBundle/Classe/Livre.php" />
         <option value="$PROJECT_DIR$/app/Resources/views/default/layout.html.twig.html" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/index.html.twig" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/widget.html.twig.html" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/acces.html.twig" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/derniers.html.twig" />
         <option value="$PROJECT_DIR$/app/config/config.yml" />
-        <option value="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" />
         <option value="$PROJECT_DIR$/src/DocumentBundle/Controller/LivresController.php" />
         <option value="$PROJECT_DIR$/web/bundles/DocumentBundle/assets/css/style.css" />
         <option value="$PROJECT_DIR$/app/Resources/views/base.html.twig" />
-        <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig" />
         <option value="$PROJECT_DIR$/app/Resources/views/layout.html.twig" />
+        <option value="$PROJECT_DIR$/src/DocumentBundle/Classe/Livre.php" />
+        <option value="$PROJECT_DIR$/app/config/parameters.yml" />
+        <option value="$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig" />
+        <option value="$PROJECT_DIR$/src/DocumentBundle/Classe/Bouquin.php" />
+        <option value="$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php" />
       </list>
     </option>
   </component>
@@ -317,6 +311,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -430,35 +425,10 @@
               <item name="web" type="462c0819:PsiDirectoryNode" />
               <item name="bundles" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="mediatheque" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mediatheque" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
-              <item name="bundles" type="462c0819:PsiDirectoryNode" />
-              <item name="DocumentBundle" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mediatheque" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mediatheque" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
-              <item name="bundles" type="462c0819:PsiDirectoryNode" />
-              <item name="DocumentBundle" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mediatheque" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mediatheque" type="462c0819:PsiDirectoryNode" />
-              <item name="web" type="462c0819:PsiDirectoryNode" />
-              <item name="bundles" type="462c0819:PsiDirectoryNode" />
-              <item name="DocumentBundle" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="css" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -518,18 +488,20 @@
       <workItem from="1539674280381" duration="9760000" />
       <workItem from="1539685161046" duration="2061000" />
       <workItem from="1539690771861" duration="554000" />
-      <workItem from="1539691350473" duration="7267000" />
+      <workItem from="1539691350473" duration="10691000" />
+      <workItem from="1539761038969" duration="7127000" />
+      <workItem from="1539768307690" duration="2897000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="30392000" />
+    <option name="totallyTimeSpent" value="43840000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="67" y="25" width="1853" height="1055" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26950747" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27614832" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -578,13 +550,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/config/parameters.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/config/routing_dev.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
@@ -665,23 +630,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Classe/Livre.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="15" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
-          <folding>
-            <element signature="e#6#88#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="11" lean-forward="true" selection-end-line="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/config/routing.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -692,26 +640,25 @@
     <entry file="file://$PROJECT_DIR$/app/config/config_dev.yml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/config/config.yml">
+    <entry file="file://$PROJECT_DIR$/web/bundles/DocumentBundle/assets/css/style.css" />
+    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/index.html.twig">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="404">
-          <caret line="40" column="9" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
+        <state relative-caret-position="225">
+          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/derniers.html.twig">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="19" selection-start-column="19" selection-end-column="19" />
+        </state>
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/DefaultController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="390">
           <caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
-          <folding>
-            <element signature="e#45#102#0#PHP" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -719,79 +666,79 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
           <caret line="24" column="10" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
-          <folding>
-            <element signature="e#45#77#0#PHP" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php">
+    <entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="34" column="75" selection-start-line="34" selection-start-column="75" selection-end-line="34" selection-end-column="75" />
-          <folding>
-            <element signature="e#45#102#0#PHP" expanded="true" />
-            <element signature="e#477#513#0#PHP" expanded="true" />
-            <element signature="e#838#874#0#PHP" expanded="true" />
-            <element signature="e#1057#1096#0#PHP" expanded="true" />
-          </folding>
+        <state relative-caret-position="225">
+          <caret line="15" column="20" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/acces.html.twig">
+    <entry file="file://$PROJECT_DIR$/app/config/config.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="14" selection-start-column="3" selection-end-column="14" />
+        <state relative-caret-position="600">
+          <caret line="40" column="9" selection-start-line="40" selection-start-column="9" selection-end-line="40" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/derniers.html.twig">
+    <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="19" selection-start-column="19" selection-end-column="19" />
+        <state relative-caret-position="45">
+          <caret line="3" column="32" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/index.html.twig">
+    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/acces.html.twig">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
-          <folding>
-            <element signature="e#13#31#0#Twig" expanded="true" />
-          </folding>
+        <state>
+          <caret column="14" selection-start-column="3" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Resources/views/base.html.twig">
+    <entry file="file://$PROJECT_DIR$/app/Resources/views/layout.html.twig">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="32" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="32" />
+        <state relative-caret-position="405">
+          <caret line="27" column="33" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/bundles/DocumentBundle/assets/css/style.css">
+    <entry file="file://$PROJECT_DIR$/app/config/parameters.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
+        <state relative-caret-position="180">
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
+    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Classe/Bouquin.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="31" lean-forward="true" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+        <state relative-caret-position="-31">
+          <caret line="20" column="39" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
           <folding>
-            <element signature="e#13#29#0#Twig" expanded="true" />
-            <element signature="e#107#126#0#HTML" expanded="true" />
-            <element signature="e#212#246#0#Twig" expanded="true" />
+            <element signature="e#6#88#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Resources/views/layout.html.twig">
+    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Resources/views/Document/livre.html.twig">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="91" selection-start-line="4" selection-start-column="91" selection-end-line="4" selection-end-column="91" />
+        <state relative-caret-position="420">
+          <caret line="28" column="12" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/DocumentBundle/Controller/LivreController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
+          <folding>
+            <element signature="e#45#102#0#PHP" expanded="true" />
+            <element signature="e#477#513#0#PHP" expanded="true" />
+            <element signature="e#821#843#1#PHP" expanded="true" />
+            <element signature="e#848#884#0#PHP" expanded="true" />
+            <element signature="e#1067#1106#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

+ 19 - 1
src/DocumentBundle/Classe/Livre.php → src/DocumentBundle/Classe/Bouquin.php

@@ -8,11 +8,29 @@
 
 namespace DocumentBundle\Classe;
 
-    class Livre
+    class Bouquin
     {
         private $id;
         private $titre;
 
+        private $biographie;
+
+        /**
+         * @return mixed
+         */
+        public function getBiographie()
+        {
+            return $this->biographie;
+        }
+
+        /**
+         * @param mixed $biographie
+         */
+        public function setBiographie($biographie)
+        {
+            $this->biographie = $biographie;
+        }
+
         public function getId ()
         {
             return $this->id;

+ 2 - 2
src/DocumentBundle/Controller/DocumentController.php

@@ -2,7 +2,7 @@
 
 namespace DocumentBundle\Controller;
 
-use DocumentBundle\Classe\Livre;
+use DocumentBundle\Classe\Bouquin;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\HttpFoundation\Request;
@@ -39,7 +39,7 @@ class DocumentController extends Controller
             'prenom'=>  'Lulu'
         );
 
-        $livre = new Livre;
+        $livre = new Bouquin;
         $livre->setTitre("Les fesses de la crémière");
 
 

+ 5 - 5
src/DocumentBundle/Controller/LivreController.php

@@ -4,7 +4,7 @@ namespace DocumentBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Routing\Annotation\Route;
-use DocumentBundle\Classe\Livre;
+use DocumentBundle\Classe\Bouquin;
 
 class LivreController extends Controller
 {
@@ -14,7 +14,7 @@ class LivreController extends Controller
      */
     public function getLivreAction ()
     {
-        $livre = new Livre;
+        $livre = new Bouquin();
         $livre->setId(80);
         $livre->setTitre("Les fesses de la crémière");
 
@@ -28,10 +28,10 @@ class LivreController extends Controller
      * @Route ("/affichelivre/{id}", name="document_affichelivre")
      */
     public function afficheLivre($id) {
-        $livre = new Livre;
-        $livre->setId($id);
-        $livre->setTitre("Le meilleur des mondes");
 
+        $em = $this->getDoctrine()->getManager();
+        $rep = $em->getRepository("DocumentBundle:Livre");
+        $livre =  $rep->find($id);
         return $this->render ("@Document\Document\livre.html.twig", array (
             "livre" =>  $livre
         ));

+ 158 - 0
src/DocumentBundle/Entity/Auteur.php

@@ -0,0 +1,158 @@
+<?php
+
+namespace DocumentBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Auteur
+ *
+ * @ORM\Table(name="auteur")
+ * @ORM\Entity(repositoryClass="DocumentBundle\Repository\AuteurRepository")
+ */
+class Auteur
+{
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="prenom", type="string", length=255)
+     */
+    private $prenom;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="nom", type="string", length=255)
+     */
+    private $nom;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="biographie", type="string", length=255)
+     */
+    private $biographie;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="genre", type="string", length=255)
+     */
+    private $genre;
+
+
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set prenom.
+     *
+     * @param string $prenom
+     *
+     * @return Auteur
+     */
+    public function setPrenom($prenom)
+    {
+        $this->prenom = $prenom;
+
+        return $this;
+    }
+
+    /**
+     * Get prenom.
+     *
+     * @return string
+     */
+    public function getPrenom()
+    {
+        return $this->prenom;
+    }
+
+    /**
+     * Set nom.
+     *
+     * @param string $nom
+     *
+     * @return Auteur
+     */
+    public function setNom($nom)
+    {
+        $this->nom = $nom;
+
+        return $this;
+    }
+
+    /**
+     * Get nom.
+     *
+     * @return string
+     */
+    public function getNom()
+    {
+        return $this->nom;
+    }
+
+    /**
+     * Set biographie.
+     *
+     * @param string $biographie
+     *
+     * @return Auteur
+     */
+    public function setBiographie($biographie)
+    {
+        $this->biographie = $biographie;
+
+        return $this;
+    }
+
+    /**
+     * Get biographie.
+     *
+     * @return string
+     */
+    public function getBiographie()
+    {
+        return $this->biographie;
+    }
+
+    /**
+     * Set genre.
+     *
+     * @param string $genre
+     *
+     * @return Auteur
+     */
+    public function setGenre($genre)
+    {
+        $this->genre = $genre;
+
+        return $this;
+    }
+
+    /**
+     * Get genre.
+     *
+     * @return string
+     */
+    public function getGenre()
+    {
+        return $this->genre;
+    }
+}

+ 158 - 0
src/DocumentBundle/Entity/Livre.php

@@ -0,0 +1,158 @@
+<?php
+
+namespace DocumentBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Livre
+ *
+ * @ORM\Table(name="livre")
+ * @ORM\Entity(repositoryClass="DocumentBundle\Repository\LivreRepository")
+ */
+class Livre
+{
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="titre", type="string", length=255)
+     */
+    private $titre;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="genre", type="string", length=255)
+     */
+    private $genre;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="nb_pages", type="integer")
+     */
+    private $nbPages;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="format", type="string", length=255)
+     */
+    private $format;
+
+
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set titre.
+     *
+     * @param string $titre
+     *
+     * @return Livre
+     */
+    public function setTitre($titre)
+    {
+        $this->titre = $titre;
+
+        return $this;
+    }
+
+    /**
+     * Get titre.
+     *
+     * @return string
+     */
+    public function getTitre()
+    {
+        return $this->titre;
+    }
+
+    /**
+     * Set genre.
+     *
+     * @param string $genre
+     *
+     * @return Livre
+     */
+    public function setGenre($genre)
+    {
+        $this->genre = $genre;
+
+        return $this;
+    }
+
+    /**
+     * Get genre.
+     *
+     * @return string
+     */
+    public function getGenre()
+    {
+        return $this->genre;
+    }
+
+    /**
+     * Set nbPages.
+     *
+     * @param int $nbPages
+     *
+     * @return Livre
+     */
+    public function setNbPages($nbPages)
+    {
+        $this->nbPages = $nbPages;
+
+        return $this;
+    }
+
+    /**
+     * Get nbPages.
+     *
+     * @return int
+     */
+    public function getNbPages()
+    {
+        return $this->nbPages;
+    }
+
+    /**
+     * Set format.
+     *
+     * @param string $format
+     *
+     * @return Livre
+     */
+    public function setFormat($format)
+    {
+        $this->format = $format;
+
+        return $this;
+    }
+
+    /**
+     * Get format.
+     *
+     * @return string
+     */
+    public function getFormat()
+    {
+        return $this->format;
+    }
+}

+ 13 - 0
src/DocumentBundle/Repository/AuteurRepository.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace DocumentBundle\Repository;
+
+/**
+ * AuteurRepository
+ *
+ * This class was generated by the Doctrine ORM. Add your own custom
+ * repository methods below.
+ */
+class AuteurRepository extends \Doctrine\ORM\EntityRepository
+{
+}

+ 13 - 0
src/DocumentBundle/Repository/LivreRepository.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace DocumentBundle\Repository;
+
+/**
+ * LivreRepository
+ *
+ * This class was generated by the Doctrine ORM. Add your own custom
+ * repository methods below.
+ */
+class LivreRepository extends \Doctrine\ORM\EntityRepository
+{
+}

+ 8 - 3
src/DocumentBundle/Resources/views/Document/livre.html.twig

@@ -11,13 +11,18 @@
 	<thead class="thead-dark">
 		<tr>
 			<th>Titre</th>
-			<th>Accès</th>
+			<th>Genre</th>
+			<th>Nombre de pages</th>
+			<th>Format</th>
+
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-		    <td class="titre-livre">{{ livre.getTitre }}</td>
-		    <td>{% include "@Document/Document/acces.html.twig" with {'titreWidget': 'Bibliothèque variable'}%}</td>
+		    <td class="titre-livre">{{ livre.titre }}</td>
+			<td>{{ livre.genre }}</td>
+			<td>{{ livre.nbPages }}</td>
+			<td>{{ livre.format }}</td>
 		</tr>
 	</tbody>
 

+ 9 - 0
src/DocumentBundle/Tests/Controller/LivreControllerTest.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace DocumentBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class LivreControllerTest extends WebTestCase
+{
+}