Skip to content
This repository was archived by the owner on Jan 1, 2020. It is now read-only.

Commit a771a5c

Browse files
weierophinneyweierophinney
committed
Merge branch 'feature/339' into develop
Close #339
2 parents 58eb163 + 25c6621 commit a771a5c

19 files changed

+114
-483
lines changed

‎module/Application/view/error/404.phtml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h1>A 404 error occurred</h1>
2-
<h2><?php echo $this->message ?></h2>
2+
<h2><?= $this->message ?></h2>
33

44
<?php if (isset($this->reason) && $this->reason): ?>
55

@@ -24,15 +24,15 @@ switch ($this->reason) {
2424
}
2525
?>
2626

27-
<p><?php echo $reasonMessage ?></p>
27+
<p><?= $reasonMessage ?></p>
2828

2929
<?php endif ?>
3030

3131
<?php if (isset($this->controller) && $this->controller): ?>
3232

3333
<dl>
3434
<dt>Controller:</dt>
35-
<dd><?php echo $this->escapeHtml($this->controller) ?>
35+
<dd><?= $this->escapeHtml($this->controller) ?>
3636
<?php
3737
if (isset($this->controller_class)
3838
&& $this->controller_class
@@ -51,19 +51,19 @@ if (isset($this->controller_class)
5151
<?php if(isset($this->exception) && ($this->exception instanceof Exception || $this->exception instanceof Error)): ?>
5252
<hr/>
5353
<h2>Additional information:</h2>
54-
<h3><?php echo get_class($this->exception); ?></h3>
54+
<h3><?= get_class($this->exception) ?></h3>
5555
<dl>
5656
<dt>File:</dt>
5757
<dd>
58-
<pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
58+
<pre class="prettyprint linenums"><?= $this->exception->getFile() ?>:<?= $this->exception->getLine() ?></pre>
5959
</dd>
6060
<dt>Message:</dt>
6161
<dd>
62-
<pre class="prettyprint linenums"><?php echo $this->exception->getMessage() ?></pre>
62+
<pre class="prettyprint linenums"><?= $this->exception->getMessage() ?></pre>
6363
</dd>
6464
<dt>Stack trace:</dt>
6565
<dd>
66-
<pre class="prettyprint linenums"><?php echo $this->exception->getTraceAsString() ?></pre>
66+
<pre class="prettyprint linenums"><?= $this->exception->getTraceAsString() ?></pre>
6767
</dd>
6868
</dl>
6969
<?php
@@ -76,19 +76,19 @@ if (isset($this->controller_class)
7676
<ul class="unstyled">
7777
<?php while($e) : ?>
7878
<li>
79-
<h3><?php echo get_class($e); ?></h3>
79+
<h3><?= get_class($e) ?></h3>
8080
<dl>
8181
<dt>File:</dt>
8282
<dd>
83-
<pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
83+
<pre class="prettyprint linenums"><?= $e->getFile() ?>:<?= $e->getLine() ?></pre>
8484
</dd>
8585
<dt>Message:</dt>
8686
<dd>
87-
<pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
87+
<pre class="prettyprint linenums"><?= $e->getMessage() ?></pre>
8888
</dd>
8989
<dt>Stack trace:</dt>
9090
<dd>
91-
<pre class="prettyprint linenums"><?php echo $e->getTraceAsString() ?></pre>
91+
<pre class="prettyprint linenums"><?= $e->getTraceAsString() ?></pre>
9292
</dd>
9393
</dl>
9494
</li>

‎module/Application/view/error/index.phtml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<h1>An error occurred</h1>
2-
<h2><?php echo $this->message ?></h2>
2+
<h2><?= $this->message ?></h2>
33

44
<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
55

66
<?php if(isset($this->exception) && ($this->exception instanceof Exception || $this->exception instanceof Error)): ?>
77
<hr/>
88
<h2>Additional information:</h2>
9-
<h3><?php echo get_class($this->exception); ?></h3>
9+
<h3><?= get_class($this->exception) ?></h3>
1010
<dl>
1111
<dt>File:</dt>
1212
<dd>
13-
<pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
13+
<pre class="prettyprint linenums"><?= $this->exception->getFile() ?>:<?= $this->exception->getLine() ?></pre>
1414
</dd>
1515
<dt>Message:</dt>
1616
<dd>
17-
<pre class="prettyprint linenums"><?php echo $this->escapeHtml($this->exception->getMessage()) ?></pre>
17+
<pre class="prettyprint linenums"><?= $this->escapeHtml($this->exception->getMessage()) ?></pre>
1818
</dd>
1919
<dt>Stack trace:</dt>
2020
<dd>
21-
<pre class="prettyprint linenums"><?php echo $this->escapeHtml($this->exception->getTraceAsString()) ?></pre>
21+
<pre class="prettyprint linenums"><?= $this->escapeHtml($this->exception->getTraceAsString()) ?></pre>
2222
</dd>
2323
</dl>
2424
<?php
@@ -31,19 +31,19 @@
3131
<ul class="unstyled">
3232
<?php while($e) : ?>
3333
<li>
34-
<h3><?php echo get_class($e); ?></h3>
34+
<h3><?= get_class($e) ?></h3>
3535
<dl>
3636
<dt>File:</dt>
3737
<dd>
38-
<pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
38+
<pre class="prettyprint linenums"><?= $e->getFile() ?>:<?= $e->getLine() ?></pre>
3939
</dd>
4040
<dt>Message:</dt>
4141
<dd>
42-
<pre class="prettyprint linenums"><?php echo $this->escapeHtml($e->getMessage()) ?></pre>
42+
<pre class="prettyprint linenums"><?= $this->escapeHtml($e->getMessage()) ?></pre>
4343
</dd>
4444
<dt>Stack trace:</dt>
4545
<dd>
46-
<pre class="prettyprint linenums"><?php echo $this->escapeHtml($e->getTraceAsString()) ?></pre>
46+
<pre class="prettyprint linenums"><?= $this->escapeHtml($e->getTraceAsString()) ?></pre>
4747
</dd>
4848
</dl>
4949
</li>

‎module/Application/view/layout/layout.phtml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
1-
<?php echo $this->doctype(); ?>
1+
<?= $this->doctype() ?>
22

33
<html lang="en">
44
<head>
55
<meta charset="utf-8">
6-
<?php echo $this->headTitle('ZF Skeleton Application')->setSeparator(' - ')->setAutoEscape(false) ?>
6+
<?= $this->headTitle('ZF Skeleton Application')->setSeparator(' - ')->setAutoEscape(false) ?>
77

8-
<?php echo $this->headMeta()
8+
<?= $this->headMeta()
99
->appendName('viewport', 'width=device-width, initial-scale=1.0')
1010
->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
1111
?>
1212

1313
<!-- Le styles -->
14-
<?php echo $this->headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'])
14+
<?= $this->headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'])
1515
->prependStylesheet($this->basePath('css/style.css'))
1616
->prependStylesheet($this->basePath('css/bootstrap-theme.min.css'))
17-
->prependStylesheet($this->basePath('css/bootstrap.min.css')) ?>
17+
->prependStylesheet($this->basePath('css/bootstrap.min.css'))
18+
?>
1819

1920
<!-- Scripts -->
20-
<?php echo $this->headScript()
21+
<?= $this->headScript()
2122
->prependFile($this->basePath('js/bootstrap.min.js'))
22-
->prependFile($this->basePath('js/jquery.min.js'))
23-
->prependFile($this->basePath('js/respond.min.js'), 'text/javascript', ['conditional' => 'lt IE 9',])
24-
->prependFile($this->basePath('js/html5shiv.min.js'), 'text/javascript', ['conditional' => 'lt IE 9',])
25-
; ?>
26-
23+
->prependFile($this->basePath('js/jquery-2.2.4.min.js'))
24+
?>
2725
</head>
2826
<body>
2927
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
@@ -34,22 +32,24 @@
3432
<span class="icon-bar"></span>
3533
<span class="icon-bar"></span>
3634
</button>
37-
<a class="navbar-brand" href="<?php echo $this->url('home') ?>"><img src="<?php echo $this->basePath('img/zf-logo.png') ?>" alt="Zend Framework 2"/>&nbsp;Skeleton Application</a>
35+
<a class="navbar-brand" href="<?php echo $this->url('home') ?>">
36+
<img src="<?= $this->basePath('img/zf-logo.png') ?>" alt="Zend Framework <?= \Application\Module::VERSION ?>"/>&nbsp;Skeleton Application
37+
</a>
3838
</div>
3939
<div class="collapse navbar-collapse">
4040
<ul class="nav navbar-nav">
41-
<li class="active"><a href="<?php echo $this->url('home') ?>">Home</a></li>
41+
<li class="active"><a href="<?= $this->url('home') ?>">Home</a></li>
4242
</ul>
43-
</div><!--/.nav-collapse -->
43+
</div>
4444
</div>
4545
</nav>
4646
<div class="container">
47-
<?php echo $this->content; ?>
47+
<?= $this->content; ?>
4848
<hr>
4949
<footer>
50-
<p>&copy; 2005 - <?php echo date('Y') ?> by Zend Technologies Ltd. All rights reserved.</p>
50+
<p>&copy; 2005 - <?= date('Y') ?> by Zend Technologies Ltd. All rights reserved.</p>
5151
</footer>
52-
</div> <!-- /container -->
53-
<?php echo $this->inlineScript() ?>
52+
</div>
53+
<?= $this->inlineScript() ?>
5454
</body>
5555
</html>

‎public/css/bootstrap-theme.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap-theme.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap-theme.min.css‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/bootstrap-theme.min.css.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)