Merge pull request #52 from s-nakajima/master

TravisのPHP7.0対応、phpdoc自動更新

.travis.yml

@@ -4,11 +4,19 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
 
 sudo: required
 
 env:
-  - NETCOMMONS_VERSION=master DB=mysql
+  matrix:
+    - NETCOMMONS_VERSION=master DB=mysql
+  global:
+    - secure: "cxAorepiMpGGAsPIivdDBTVuft6QbLEESGWTPWBPZONu5Yk1boriPZAMlbkxsQjd+TI0Qg6+lzr+1cgIJIgfS7EAyH+QMop7DQ6I66S95y84SO+Xs+W/MGzfEug6qNmoAvtgvR/vBNiW4H4WmauiYPWsziuoAdwIKE8qKfBLkKc="
+    - GIT_COMMITTER_NAME=s-nakajima
+    - GIT_COMMITTER_EMAIL=nakajimashouhei@gmail.com
+    - GIT_AUTHOR_NAME=s-nakajima
+    - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com
 
 before_script:
   - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3

Controller/BbsArticlesController.php

@@ -10,7 +10,7 @@
  */
 
 App::uses('BbsesAppController', 'Bbses.Controller');
-App::uses('String', 'Utility');
+App::uses('CakeText', 'Utility');
 App::uses('Workflow', 'Workflow.Controller/Component');
 App::uses('MailSend', 'Mails.Utility');
 

View/Elements/BbsArticles/breadcrumb.ctp

@@ -13,7 +13,7 @@
 <ol class="breadcrumb">
 	<li>
 		<?php echo $this->NetCommonsHtml->link(
-				String::truncate($bbs['name'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
+				CakeText::truncate($bbs['name'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
 				NetCommonsUrl::backToPageUrl(),
 				array('title' => $bbs['name'])
 			); ?>
@@ -22,7 +22,7 @@
 	<?php if (isset($rootBbsArticle)) : ?>
 		<li>
 			<?php echo $this->NetCommonsHtml->link(
-					String::truncate($rootBbsArticle['BbsArticle']['title'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
+					CakeText::truncate($rootBbsArticle['BbsArticle']['title'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
 					array('key' => $rootBbsArticle['BbsArticle']['key']),
 					array('title' => $rootBbsArticle['BbsArticle']['title'])
 				); ?>
@@ -32,7 +32,7 @@
 	<?php if (isset($parentBbsArticle) && $parentBbsArticle['BbsArticleTree']['root_id']) : ?>
 		<li>
 			<?php echo $this->NetCommonsHtml->link(
-					String::truncate($parentBbsArticle['BbsArticle']['title'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
+					CakeText::truncate($parentBbsArticle['BbsArticle']['title'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
 					array('key' => $parentBbsArticle['BbsArticle']['key']),
 					array('title' => $parentBbsArticle['BbsArticle']['title'])
 				); ?>
@@ -43,12 +43,12 @@
 		<li class="active">
 			<?php if (in_array($this->request->params['action'], array('add', 'edit'), true)) : ?>
 				<?php echo $this->NetCommonsHtml->link(
-						String::truncate($currentBbsArticle['BbsArticle']['title'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
+						CakeText::truncate($currentBbsArticle['BbsArticle']['title'], BbsArticle::BREADCRUMB_TITLE_LENGTH),
 						array('key' => $currentBbsArticle['BbsArticle']['key']),
 						array('title' => $currentBbsArticle['BbsArticle']['title'])
 					); ?>
 			<?php else : ?>
-				<?php echo String::truncate($currentBbsArticle['BbsArticle']['title'], BbsArticle::LIST_TITLE_LENGTH); ?>
+				<?php echo CakeText::truncate($currentBbsArticle['BbsArticle']['title'], BbsArticle::LIST_TITLE_LENGTH); ?>
 			<?php endif; ?>
 		</li>
 	<?php endif; ?>

View/Elements/BbsArticles/index_bbs_article.ctp

@@ -13,7 +13,7 @@
 <article>
 	<h2 class="clearfix">
 		<?php echo $this->NetCommonsHtml->link(
-				String::truncate($bbsArticle['BbsArticle']['title'], BbsArticle::LIST_TITLE_LENGTH),
+				CakeText::truncate($bbsArticle['BbsArticle']['title'], BbsArticle::LIST_TITLE_LENGTH),
 				array('action' => 'view', 'key' => $bbsArticle['BbsArticle']['key'])
 			); ?>
 		<small>
@@ -22,7 +22,7 @@
 	</h2>
 
 	<p>
-		<?php echo String::truncate(strip_tags($bbsArticle['BbsArticle']['content']), BbsArticle::LIST_CONTENT_LENGTH); ?>
+		<?php echo CakeText::truncate(strip_tags($bbsArticle['BbsArticle']['content']), BbsArticle::LIST_CONTENT_LENGTH); ?>
 	</p>
 
 	<footer class="clearfix">