Merge pull request #71 from cakephp/master-additions

Add more changes.
cakephp · Jan 7, 2015 · 9a3c630 · 9a3c630
2 parents cacab10 + 6410f90
commit 9a3c630
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/src/Shell/Task/MethodNamesTask.php b/src/Shell/Task/MethodNamesTask.php
@@ -61,6 +61,11 @@ protected function _process($path) {
 				'#\$this->Html->webroot\(#',
 				'$this->Url->webroot(',
 			],
+			[
+				'Replace $this->Session->flash() with $this->Flash->render()',
+				'#\$this->Session->flash\(#',
+				'$this->Flash->render(',
+			]
 		];
 
 		$otherPatterns = [

diff --git a/src/Shell/Task/MethodSignaturesTask.php b/src/Shell/Task/MethodSignaturesTask.php
@@ -41,16 +41,36 @@ protected function _process($path) {
 				'#\bfunction beforeFilter\(\)#i',
 				'function beforeFilter(Event $event)',
 			],
+			[
+				'parent::beforeFilter(Event $event) call',
+				'#\bparent::beforeFilter\(\)#i',
+				'parent::beforeFilter($event)',
+			],
 			[
 				'beforeRender(Event $event) callback',
 				'#\bfunction beforeRender\(\)#i',
 				'function beforeRender(Event $event)',
 			],
+			[
+				'parent::beforeRender(Event $event) call',
+				'#\bparent::beforeRender\(\)#i',
+				'parent::beforeRender($event)',
+			],
 			[
 				'afterFilter(Event $event) callback',
 				'#\bfunction afterFilter\(\)#i',
 				'function afterFilter(Event $event)',
 			],
+			[
+				'parent::afterFilter(Event $event) call',
+				'#\bparent::afterFilter\(\)#i',
+				'parent::afterFilter($event)',
+			],
+			[
+				'constructClasses() method',
+				'#\bfunction constructClasses\(\)#i',
+				'function initialize()',
+			],
 		];
 		$componentPatterns = [
 			[
@@ -113,9 +133,9 @@ protected function _process($path) {
 		];
 		$modelPatterns = [
 			[
-				'beforeValidate(Event $event, Entity $entity, ArrayObject $options) callback',
+				'beforeRules(Event $event, Entity $entity, ArrayObject $options) callback',
 				'#\bfunction beforeValidate\(array $options\s*=\s*array\(\)\)#i',
-				'function beforeValidate(Event $event, Entity $entity, ArrayObject $options)',
+				'function beforeRules(Event $event, Entity $entity, ArrayObject $options)',
 			],
 			[
 				'beforeSave(Event $event, Entity $entity, ArrayObject $options) callback',
@@ -128,9 +148,9 @@ protected function _process($path) {
 				'function beforeDelete(Event $event, Entity $entity, ArrayObject $options)',
 			],
 			[
-				'afterValidate(Event $event, Entity $entity, ArrayObject $options) callback',
+				'afterRules(Event $event, Entity $entity, ArrayObject $options) callback',
 				'#\bfunction afterValidate\(\)#i',
-				'function afterValidate(Event $event, Entity $entity, ArrayObject $options)',
+				'function afterRules(Event $event, Entity $entity, ArrayObject $options)',
 			],
 			[
 				'afterSave(Event $event, Entity $entity, ArrayObject $options) callback',
@@ -145,9 +165,9 @@ protected function _process($path) {
 		];
 		$behaviorPatterns = [
 			[
-				'beforeValidate(Event $event, Entity $entity, ArrayObject $options) callback',
+				'beforeRules(Event $event, Entity $entity, ArrayObject $options) callback',
 				'#\bfunction beforeValidate\(Model $Model,\s*$options\s*=\s*array\(\)\)#i',
-				'function beforeValidate(Event $event, Entity $entity, ArrayObject $options)',
+				'function beforeRules(Event $event, Entity $entity, ArrayObject $options)',
 			],
 			[
 				'beforeSave(Event $event, Entity $entity, ArrayObject $options) callback',
@@ -160,9 +180,9 @@ protected function _process($path) {
 				'function beforeDelete(Event $event, Entity $entity, ArrayObject $options)',
 			],
 			[
-				'afterValidate(Event $event, Entity $entity, ArrayObject $options) callback',
+				'afterRules(Event $event, Entity $entity, ArrayObject $options) callback',
 				'#\bfunction afterValidate\(Model $Model\)#i',
-				'function afterValidate(Event $event, Entity $entity, ArrayObject $options)',
+				'function afterRules(Event $event, Entity $entity, ArrayObject $options)',
 			],
 			[
 				'afterSave(Event $event, Entity $entity, ArrayObject $options) callback',