Migrating template to framework agnostic

.gitignore

@@ -0,0 +1,3 @@
+composer.lock
+vendor/
+mouf/

.travis.yml

@@ -0,0 +1,16 @@
+language: php
+matrix:
+  include:
+  - php: 7.2
+    env: PREFER_LOWEST=""
+  - php: 7.1
+    env: PREFER_LOWEST=""
+#  - php: 7.1
+#    env: PREFER_LOWEST="--prefer-lowest"
+
+before_script:
+- composer update $PREFER_LOWEST --no-interaction
+- mkdir -p build/logs
+script:
+- composer cs-check
+- composer phpstan

README.md

@@ -26,6 +26,7 @@ Bootstrap version | Template version
 3.*               | 4.0
 3.*               | 4.1
 4.*               | 5.0
+4.*               | 5.1 (uses Service providers instead of Mouf installer)
 
 Bootstrap menu rendererer
 -------------------------

composer.json

@@ -16,26 +16,30 @@
 	"homepage" : "http://twitter.github.com/bootstrap/",
 	"license" : "MIT",
 	"require" : {
-		"mouf/html.utils.weblibrarymanager" : "~3.0",
-	        "mouf/html.utils.weblibrarymanager.component-installer" : "~2.2",
-		"mouf/html.widgets.messageservice" : "~3.0",
-		"php" : ">=5.4.0",
-		"mouf/html.widgets.menu" : "~3.0",
-		"mouf/html.template.templateinterface" : "~2.1"
+		"mouf/html.utils.weblibrarymanager" : "~4.0",
+		"mouf/html.widgets.messageservice" : "~4.0",
+		"php" : ">=7.1",
+		"mouf/html.widgets.menu" : "^4",
+		"mouf/html.template.templateinterface" : "^3"
+	},
+	"require-dev": {
+		"phpstan/phpstan": "^0.10.3",
+		"thecodingmachine/phpstan-strict-rules": "^0.10.3",
+		"squizlabs/php_codesniffer": "^3.3.1"
+	},
+	"conflict": {
+		"mouf/mouf": "~2.0.0"
 	},
 	"autoload" : {
 		"psr-0" : {
 			"Mouf" : "src/"
 		}
 	},
-	"extra" : {
-		"mouf" : {
-			"install" : [{
-					"type" : "class",
-					"class" : "Mouf\\Html\\Template\\BootstrapTemplateInstaller"
-				}
-			],
-			"logo" : "icons/logo.png"
-		}
-	}
+	"scripts": {
+		"cs-check": "phpcs",
+		"cs-fix": "phpcbf",
+		"phpstan": "phpstan analyse src/Mouf -c phpstan.neon --level=5 --no-progress -vvv"
+	},
+	"minimum-stability": "dev",
+	"prefer-stable": true
 }

discovery.json

@@ -0,0 +1,3 @@
+{
+  "Interop\\Container\\ServiceProviderInterface": "Mouf\\Html\\Template\\BootstrapTemplateServiceProvider"
+}

phpcs.xml.dist

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<ruleset name="Expressive Skeleton coding standard">
+    <description>Expressive Skeleton coding standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="colors"/>
+
+    <!-- inherit rules from: -->
+    <rule ref="PSR2"/>
+
+    <!-- Paths to check -->
+    <file>src</file>
+
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="300"/>
+            <property name="absoluteLineLimit" value="500"/>
+        </properties>
+    </rule>
+</ruleset>

phpstan.neon

@@ -0,0 +1,5 @@
+#parameters:
+#    ignoreErrors:
+#     - "#you should not use the \\$_REQUEST superglobal#"
+includes:
+    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon

src/Mouf/Html/Template/BootstrapTemplate.php

@@ -23,8 +23,6 @@ class BootstrapTemplate extends BaseTemplate
         Renderable::toHtml as toHtmlRenderer;
     }
 
-    const TEMPLATE_ROOT_URL = "vendor/mouf/html.template.bootstrap/";
-
     /**
      * The left menu of the template.
      *
@@ -117,23 +115,13 @@ class BootstrapTemplate extends BaseTemplate
      */
     protected $containerClass = "container";
 
-    /**
-     * Default constructor
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        //$this->favIconUrl = self::TEMPLATE_ROOT_URL."images/favicon.png";
-        //$this->logoUrl = self::TEMPLATE_ROOT_URL."images/logo.png";
-    }
-
     /**
      * Draws the template.
      */
     public function toHtml()
     {
         // Let's register the template renderer in the default renderer.
-        $this->getDefaultRenderer()->setTemplateRenderer($this->getTemplateRenderer());
+        $this->getDefaultRenderer()->setTemplateRendererInstanceName($this->getTemplateRendererInstanceName());
 
         header('Content-Type: text/html; charset=utf-8');
         //Renderable::toHtml();// __DIR__."/../../../../views/template.php";
@@ -146,7 +134,7 @@ public function toHtml()
      * @Property
      * @param HtmlElementInterface $left
      */
-    public function setLeft(HtmlElementInterface $left)
+    public function setLeft(HtmlElementInterface $left): void
     {
         $this->left = $left;
     }
@@ -157,7 +145,7 @@ public function setLeft(HtmlElementInterface $left)
      * @Property
      * @param HtmlElementInterface $right
      */
-    public function setRight(HtmlElementInterface $right)
+    public function setRight(HtmlElementInterface $right): void
     {
         $this->right = $right;
     }
@@ -168,7 +156,7 @@ public function setRight(HtmlElementInterface $right)
      * @Property
      * @param HtmlElementInterface $header
      */
-    public function setHeader(HtmlElementInterface $header)
+    public function setHeader(HtmlElementInterface $header): void
     {
         $this->header = $header;
     }
@@ -179,47 +167,47 @@ public function setHeader(HtmlElementInterface $header)
      * @Property
      * @param HtmlElementInterface $footer
      */
-    public function setFooter(HtmlElementInterface $footer)
+    public function setFooter(HtmlElementInterface $footer): void
     {
         $this->footer = $footer;
     }
 
     /**
      * The content of the template.
      */
-    public function getContent()
+    public function getContent(): ?HtmlElementInterface
     {
         return $this->content;
     }
 
     /**
      * The left menu of the template.
      */
-    public function getLeft()
+    public function getLeft(): ?HtmlElementInterface
     {
         return $this->left;
     }
 
     /**
      * The right menu of the template.
      */
-    public function getRight()
+    public function getRight(): ?HtmlElementInterface
     {
         return $this->right;
     }
 
     /**
      * The header of the template.
      */
-    public function getHeader()
+    public function getHeader(): ?HtmlElementInterface
     {
         return $this->header;
     }
 
     /**
      * The footer of the template.
      */
-    public function getFooter()
+    public function getFooter(): ?HtmlElementInterface
     {
         return $this->footer;
     }
@@ -232,7 +220,7 @@ public function getFooter()
      * @Property
      * @param int $leftColumnSize
      */
-    public function setLeftColumnSize($leftColumnSize)
+    public function setLeftColumnSize(int $leftColumnSize): void
     {
         $this->leftColumnSize = $leftColumnSize;
     }
@@ -245,7 +233,7 @@ public function setLeftColumnSize($leftColumnSize)
      * @Property
      * @param int $rightColumnSize
      */
-    public function setRightColumnSize($rightColumnSize)
+    public function setRightColumnSize(int $rightColumnSize): void
     {
         $this->rightColumnSize = $rightColumnSize;
     }
@@ -256,7 +244,7 @@ public function setRightColumnSize($rightColumnSize)
      * If you are not using the left column, the size of the column is 0.
      *
      */
-    public function getLeftColumnSize()
+    public function getLeftColumnSize(): int
     {
         return $this->leftColumnSize;
     }
@@ -267,7 +255,7 @@ public function getLeftColumnSize()
      * If you are not using the right column, the size of the column is 0.
      *
      */
-    public function getRightColumnSize()
+    public function getRightColumnSize(): int
     {
         return $this->rightColumnSize;
     }
@@ -277,7 +265,7 @@ public function getRightColumnSize()
      *
      * @param bool $wrapLeftSideBarInWell
      */
-    public function setWrapLeftSideBarInWell($wrapLeftSideBarInWell)
+    public function setWrapLeftSideBarInWell(bool $wrapLeftSideBarInWell): void
     {
         $this->wrapLeftSideBarInWell = $wrapLeftSideBarInWell;
     }
@@ -287,7 +275,7 @@ public function setWrapLeftSideBarInWell($wrapLeftSideBarInWell)
      *
      * @param bool $wrapRightSideBarInWell
      */
-    public function setWrapRightSideBarInWell($wrapRightSideBarInWell)
+    public function setWrapRightSideBarInWell(bool $wrapRightSideBarInWell): void
     {
         $this->wrapRightSideBarInWell = $wrapRightSideBarInWell;
     }
@@ -296,15 +284,15 @@ public function setWrapRightSideBarInWell($wrapRightSideBarInWell)
      * Whether we should or not put the left sidebar in a Bootstrap "well" element.
      *
      */
-    public function getWrapLeftSideBarInWell()
+    public function getWrapLeftSideBarInWell(): bool
     {
         return $this->wrapLeftSideBarInWell;
     }
 
     /**
      * Whether we should or not put the left sidebar in a Bootstrap "well" element.
      */
-    public function getWrapRightSideBarInWell()
+    public function getWrapRightSideBarInWell(): bool
     {
         return $this->wrapRightSideBarInWell;
     }
@@ -313,7 +301,7 @@ public function getWrapRightSideBarInWell()
      * The css class applied to the container div.
      * @param string $containerClass
      */
-    public function setContainerClass($containerClass)
+    public function setContainerClass(string $containerClass): void
     {
         $this->containerClass = $containerClass;
     }