Skip to content

Commit

Permalink
Merge pull request #360 from cakephp/bugfix/indentation
Browse files Browse the repository at this point in the history
Fix indentation for annotation doc blocks
  • Loading branch information
dereuromark authored Sep 15, 2017
2 parents aee9bc0 + 3b9510d commit 952f1d4
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions src/Template/Bake/Template/add.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
%>
<?php
/**
* @var \<%= $namespace %>\View\AppView $this
*/
* @var \<%= $namespace %>\View\AppView $this
*/
?>
<%= $this->element('form');
4 changes: 2 additions & 2 deletions src/Template/Bake/Template/edit.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
%>
<?php
/**
* @var \<%= $namespace %>\View\AppView $this
*/
* @var \<%= $namespace %>\View\AppView $this
*/
?>
<%= $this->element('form');
6 changes: 3 additions & 3 deletions src/Template/Bake/Template/index.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
%>
<?php
/**
* @var \<%= $namespace %>\View\AppView $this
* @var \<%= $entityClass %>[]|\Cake\Collection\CollectionInterface $<%= $pluralVar %>
*/
* @var \<%= $namespace %>\View\AppView $this
* @var \<%= $entityClass %>[]|\Cake\Collection\CollectionInterface $<%= $pluralVar %>
*/
?>
<%
use Cake\Utility\Inflector;
Expand Down
4 changes: 2 additions & 2 deletions src/Template/Bake/Template/login.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
%>
<?php
/**
* @var \<%= $namespace %>\View\AppView $this
*/
* @var \<%= $namespace %>\View\AppView $this
*/
?>
<div class="<%= $pluralVar %> form">
<?= $this->Flash->render('auth') ?>
Expand Down
6 changes: 3 additions & 3 deletions src/Template/Bake/Template/view.ctp
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
%>
<?php
/**
* @var \<%= $namespace %>\View\AppView $this
* @var \<%= $entityClass %> $<%= $singularVar %>
*/
* @var \<%= $namespace %>\View\AppView $this
* @var \<%= $entityClass %> $<%= $singularVar %>
*/
?>
<%
use Cake\Utility\Inflector;
Expand Down
4 changes: 2 additions & 2 deletions tests/comparisons/Template/testBakeEdit.ctp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
*/
* @var \Bake\Test\App\View\AppView $this
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down
6 changes: 3 additions & 3 deletions tests/comparisons/Template/testBakeIndex.ctp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
* @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
*/
* @var \Bake\Test\App\View\AppView $this
* @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down
6 changes: 3 additions & 3 deletions tests/comparisons/Template/testBakeIndexWithIndexLimit.ctp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
* @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
*/
* @var \Bake\Test\App\View\AppView $this
* @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down
6 changes: 3 additions & 3 deletions tests/comparisons/Template/testBakeView.ctp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
* @var \Cake\Datasource\EntityInterface $author
*/
* @var \Bake\Test\App\View\AppView $this
* @var \Cake\Datasource\EntityInterface $author
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down
6 changes: 3 additions & 3 deletions tests/comparisons/Template/testGetContent.ctp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
* @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
*/
* @var \Bake\Test\App\View\AppView $this
* @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down
6 changes: 3 additions & 3 deletions tests/comparisons/Template/testGetContentAssociations.ctp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
* @var \Bake\Test\App\Model\Entity\TemplateTaskComment $templateTaskComment
*/
* @var \Bake\Test\App\View\AppView $this
* @var \Bake\Test\App\Model\Entity\TemplateTaskComment $templateTaskComment
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
*/
* @var \Bake\Test\App\View\AppView $this
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* @var \Bake\Test\App\View\AppView $this
* @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
*/
* @var \Bake\Test\App\View\AppView $this
* @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
*/
?>
<nav class="large-3 medium-4 columns" id="actions-sidebar">
<ul class="side-nav">
Expand Down

0 comments on commit 952f1d4

Please sign in to comment.