upgrade to attogram/router ^4

attogram · Apr 6, 2019 · 17cbe6e · 17cbe6e
1 parent 97e443c
commit 17cbe6e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     },
     "require": {
-        "attogram/router": "^1.0",
+        "attogram/router": "^4.0",
         "php": "^7.0"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/BodyMassInfoTable.php b/src/BodyMassInfoTable.php
@@ -14,7 +14,7 @@ class BodyMassInfoTable
     use TemplateTrait;
 
     /** @var string Version*/
-    const VERSION = '2.1.0';
+    const VERSION = '2.1.1.pre.0';
 
     /** @var Router */
     private $router;
@@ -33,6 +33,7 @@ public function route()
         $this->router = new Router();
         $this->router->allow('/', 'home');
         $this->router->allow('/about', 'about');
+        /** @var string|null $match */
         $match = $this->router->match();
         if ($match) {
             $this->routePage($match);

diff --git a/templates/footer.php b/templates/footer.php
@@ -12,9 +12,9 @@
 <footer>
     <br />
     <div class="hdr bw bold">
-    <a href="<?= $this->router->getUriBase(); ?>/">Body Mass Info Table v<?= BodyMassInfoTable::VERSION; ?></a>
+    <a href="<?= $this->router->getHome() ?>">Body Mass Info Table v<?= BodyMassInfoTable::VERSION; ?></a>
         &nbsp;&nbsp;
-    <a href="<?= $this->router->getUriBase(); ?>/about/">About</a>
+    <a href="<?= $this->router->getHome() ?>about/">About</a>
         &nbsp;&nbsp;
     <a href="https://github.com/attogram/body-mass-info-table" target="github">Github</a>
     </div>

diff --git a/templates/header.php b/templates/header.php
@@ -33,7 +33,7 @@
 </style></head><body>
 <div class="container-fluid">
     <div class="hdr bw bold">
-        <a href="<?= $this->router->getUriBase(); ?>/">Body Mass Info Table</a>
+        <a href="<?= $this->router->getHome() ?>">Body Mass Info Table</a>
         &nbsp;&nbsp;
-        <a href="<?= $this->router->getUriBase(); ?>/about/">About</a>
+        <a href="<?= $this->router->getHome() ?>about/">About</a>
     </div>