ID#183: migrated APF\core namespace to APF 2.2.

AdventurePHP · Jun 28, 2014 · 1782d97 · 1782d97
1 parent bcff080
commit 1782d97
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/...ocumentcontroller/ErrorPageController.php → ...andler/controller/ErrorPageController.php b/...ocumentcontroller/ErrorPageController.php → ...andler/controller/ErrorPageController.php
diff --git a/core/errorhandler/templates/errorpage.html b/core/errorhandler/templates/errorpage.html
@@ -1,5 +1,5 @@
 <@controller
-   class="APF\core\errorhandler\documentcontroller\ErrorPageController"
+   class="APF\core\errorhandler\controller\ErrorPageController"
 @>
 <style type="text/css">
     .apf-exception {
@@ -113,23 +113,23 @@ <h1>Error!</h1>
       <dl>
          <dt>Error-ID:</dt>
          <dd>
-            <html:placeholder name="ErrorID"/>
+            ${ErrorID}
          </dd>
          <dt>Message:</dt>
          <dd>
-            <html:placeholder name="ErrorMessage"/>
+            ${ErrorMessage}
          </dd>
          <dt>Number:</dt>
          <dd>
-            <html:placeholder name="ErrorNumber"/>
+            ${ErrorNumber}
          </dd>
          <dt>File:</dt>
          <dd>
-            <html:placeholder name="ErrorFile"/>
+            ${ErrorFile}
          </dd>
          <dt>Line:</dt>
          <dd>
-            <html:placeholder name="ErrorLine"/>
+            ${ErrorLine}
          </dd>
       </dl>
    </div>
@@ -156,25 +156,25 @@ <h2>Stacktrace:</h2>
            </tr>
        </thead>
        <tbody>
-       <html:placeholder name="Stacktrace"/>
+       ${Stacktrace}
       </tbody>
    </table>
 
    <div class="apf-footnote">
-       <span>Generated by <a href="http://adventure-php-framework.org">Adventure PHP Framework</a> at <html:placeholder name="GenerationDate"/></span>
+       <span>Generated by <a href="http://adventure-php-framework.org">Adventure PHP Framework</a> at ${GenerationDate}</span>
    </div>
 </div>
 
 <html:template name="ErrorEntry">
    <tr>
        <td>
-          <template:placeholder name="Class"/><template:placeholder name="Type"/><template:placeholder name="Function"/>()
+          ${Class}${Type}${Function}()
        </td>
        <td>
-          <template:placeholder name="File"/>
+          ${File}
        </td>
        <td>
-          <template:placeholder name="Line"/>
+          ${Line}
        </td>
    </tr>
 </html:template>
diff --git a/...entcontroller/ExceptionPageController.php → ...er/controller/ExceptionPageController.php b/...entcontroller/ExceptionPageController.php → ...er/controller/ExceptionPageController.php
diff --git a/core/exceptionhandler/templates/exceptionpage.html b/core/exceptionhandler/templates/exceptionpage.html
@@ -1,5 +1,5 @@
 <@controller
-   class="APF\core\exceptionhandler\documentcontroller\ExceptionPageController"
+   class="APF\core\exceptionhandler\controller\ExceptionPageController"
 @>
 <style type="text/css">
     .apf-exception {
@@ -112,27 +112,27 @@ <h1>Uncaught exception!</h1>
         <dl>
             <dt>Exception-ID:</dt>
             <dd>
-               <html:placeholder name="ExceptionID"/>
+               ${ExceptionID}
             </dd>
             <dt>Type:</dt>
             <dd>
-               <html:placeholder name="ExceptionType"/>
+               ${ExceptionType}
             </dd>
             <dt>Message:</dt>
             <dd>
-               <html:placeholder name="ExceptionMessage"/>
+               ${ExceptionMessage}
             </dd>
             <dt>Number:</dt>
             <dd>
-               <html:placeholder name="ExceptionNumber"/>
+               ${ExceptionNumber}
             </dd>
             <dt>File:</dt>
             <dd>
-               <html:placeholder name="ExceptionFile"/>
+               ${ExceptionFile}
             </dd>
             <dt>Line:</dt>
             <dd>
-               <html:placeholder name="ExceptionLine"/>
+               ${ExceptionLine}
             </dd>
         </dl>
     </div>
@@ -159,25 +159,25 @@ <h2>Stacktrace:</h2>
            </tr>
        </thead>
        <tbody>
-         <html:placeholder name="Stacktrace"/>
+         ${Stacktrace}
        </tbody>
    </table>
 
    <div class="apf-footnote">
-       <span>Generated by <a href="http://adventure-php-framework.org">Adventure PHP Framework</a> at <html:placeholder name="GenerationDate"/></span>
+       <span>Generated by <a href="http://adventure-php-framework.org">Adventure PHP Framework</a> at ${GenerationDate}</span>
    </div>
 </div>
 
 <html:template name="ExceptionEntry">
    <tr>
        <td>
-          <template:placeholder name="Class"/><template:placeholder name="Type"/><template:placeholder name="Function"/>()
+          ${Class}${Type}${Function}()
        </td>
        <td>
-          <template:placeholder name="File"/>
+          ${File}
        </td>
        <td>
-          <template:placeholder name="Line"/>
+          ${Line}
        </td>
    </tr>
 </html:template>