Skip to content
Permalink
Browse files

ID#323: removed unnecessary & signs in method declarations.

  • Loading branch information...
Christian Achatz
Christian Achatz committed Apr 28, 2018
1 parent 3638650 commit e3f39a379bcc1ad9eb8c012461ab8c850c5b8fa0
Showing with 66 additions and 64 deletions.
  1. +1 −1 core/filter/InputFilterChain.php
  2. +1 −1 core/filter/OutputFilterChain.php
  3. +1 −1 extensions/arraypager/biz/ArrayPagerManagerFabric.php
  4. +1 −1 extensions/htmlheader/biz/filter/JsCssInclusionFilterChain.php
  5. +1 −1 modules/captcha/pres/taglib/SimpleCaptchaTag.php
  6. +1 −1 modules/comments/data/ArticleCommentMapper.php
  7. +1 −1 modules/genericormapper/data/BaseMapper.php
  8. +1 −1 modules/genericormapper/data/GenericDomainObject.php
  9. +1 −1 modules/genericormapper/data/GenericORMapperDataObject.php
  10. +3 −3 modules/guestbook2009/biz/GuestbookService.php
  11. +3 −2 modules/guestbook2009/pres/controller/GuestbookBaseController.php
  12. +1 −1 modules/usermanagement/biz/UmgtManager.php
  13. +1 −1 modules/usermanagement/pres/condition/UserDependentContentConditionSet.php
  14. +1 −1 modules/usermanagement/pres/documentcontroller/UmgtBaseController.php
  15. +1 −1 tests/suites/core/filter/TestableChainedStandardInputFilter.php
  16. +1 −1 tests/suites/core/filter/TestableChainedUrlRewritingInputFilter.php
  17. +1 −1 tests/suites/tools/form/taglib/ButtonTagTest.php
  18. +2 −2 tests/suites/tools/form/taglib/CheckBoxTagTest.php
  19. +1 −1 tests/suites/tools/form/taglib/ImageButtonTagTest.php
  20. +1 −1 tests/suites/tools/form/taglib/RadioButtonTagTest.php
  21. +1 −1 tools/cache/CacheManagerFabric.php
  22. +1 −1 tools/cache/provider/DBCacheProvider.php
  23. +2 −2 tools/form/FormMarker.php
  24. +1 −1 tools/form/taglib/AbstractFormControl.php
  25. +4 −4 tools/form/taglib/DateSelectorTag.php
  26. +2 −2 tools/form/taglib/DynamicFormElementMarkerTag.php
  27. +2 −2 tools/form/taglib/FormGroupTag.php
  28. +1 −1 tools/form/taglib/Html5DateFieldTag.php
  29. +1 −1 tools/form/taglib/Html5DateTimeLocalFieldTag.php
  30. +1 −1 tools/form/taglib/Html5MonthFieldTag.php
  31. +1 −1 tools/form/taglib/Html5TimeFieldTag.php
  32. +1 −1 tools/form/taglib/Html5WeekFieldTag.php
  33. +2 −2 tools/form/taglib/SelectBoxGroupTag.php
  34. +4 −4 tools/form/taglib/SelectBoxTag.php
  35. +1 −1 tools/form/taglib/TextAreaTag.php
  36. +4 −4 tools/form/taglib/TimeSelectorTag.php
  37. +1 −1 tools/html/taglib/HtmlIteratorItemTag.php
  38. +3 −2 tools/html/taglib/HtmlIteratorTag.php
  39. +8 −8 tools/link/Url.php
@@ -40,7 +40,7 @@ private function __construct() {
/** /**
* @return InputFilterChain The instance of the current input filter chain. * @return InputFilterChain The instance of the current input filter chain.
*/ */
public static function &getInstance() { public static function getInstance() {
if (self::$CHAIN === null) { if (self::$CHAIN === null) {
self::$CHAIN = new InputFilterChain(); self::$CHAIN = new InputFilterChain();
} }
@@ -40,7 +40,7 @@ private function __construct() {
/** /**
* @return OutputFilterChain The instance of the current output filter chain. * @return OutputFilterChain The instance of the current output filter chain.
*/ */
public static function &getInstance() { public static function getInstance() {
if (self::$CHAIN === null) { if (self::$CHAIN === null) {
self::$CHAIN = new OutputFilterChain(); self::$CHAIN = new OutputFilterChain();
} }
@@ -54,7 +54,7 @@ final class ArrayPagerManagerFabric extends APFObject {
* @version * @version
* Version 0.1, 21.12.2009<br /> * Version 0.1, 21.12.2009<br />
*/ */
public function &getArrayPagerManager($config) { public function getArrayPagerManager($config) {
// create cache key // create cache key
$cacheKey = md5($config); $cacheKey = md5($config);
@@ -43,7 +43,7 @@ private function __construct() {
/** /**
* @return JsCssInclusionFilterChain The instance of the current jscssinclusion filter chain. * @return JsCssInclusionFilterChain The instance of the current jscssinclusion filter chain.
*/ */
public static function &getInstance() { public static function getInstance() {
if (self::$CHAIN === null) { if (self::$CHAIN === null) {
self::$CHAIN = new JsCssInclusionFilterChain(); self::$CHAIN = new JsCssInclusionFilterChain();
} }
@@ -201,7 +201,7 @@ public function getCurrentCaptcha() {
* @version * @version
* Version 0.1, 30.08.2009<br /> * Version 0.1, 30.08.2009<br />
*/ */
public function &getCaptchaTextField() { public function getCaptchaTextField() {
return $this->textField; return $this->textField;
} }
@@ -68,7 +68,7 @@ public function loadArticleCommentByID($commentId) {
* @version * @version
* Version 0.1, 09.06.2008<br /> * Version 0.1, 09.06.2008<br />
*/ */
private function &getConnection() { private function getConnection() {
/* @var $cM ConnectionManager */ /* @var $cM ConnectionManager */
$cM = $this->getServiceObject(ConnectionManager::class); $cM = $this->getServiceObject(ConnectionManager::class);
@@ -508,7 +508,7 @@ public function addDomainObjectsConfiguration($configNamespace, $configNameAffix
* @version * @version
* Version 0.1, 20.02.2010<br /> * Version 0.1, 20.02.2010<br />
*/ */
public function &getDbDriver() { public function getDbDriver() {
return $this->dbDriver; return $this->dbDriver;
} }
@@ -196,7 +196,7 @@ public function deleteDataComponent() {
* @version * @version
* Version 0.1, 11.10.2009<br /> * Version 0.1, 11.10.2009<br />
*/ */
public function &getDataComponent() { public function getDataComponent() {
return $this->dataComponent; return $this->dataComponent;
} }
@@ -48,7 +48,7 @@ public function setDataComponent(GenericORRelationMapper &$orm);
/** /**
* @return GenericORRelationMapper The instance of the o/r mapper. * @return GenericORRelationMapper The instance of the o/r mapper.
*/ */
public function &getDataComponent(); public function getDataComponent();
/** /**
* @param string $relationName The name of the relation to load the objects with. * @param string $relationName The name of the relation to load the objects with.
@@ -113,7 +113,7 @@ public function loadPagedEntryList() {
* @version * @version
* Version 0.1, 13.06.2009<br /> * Version 0.1, 13.06.2009<br />
*/ */
private function &getPager() { private function getPager() {
if ($this->pager === null) { if ($this->pager === null) {
$this->pager = $this->getServiceObject(PagerManager::class, [], APFService::SERVICE_TYPE_NORMAL); $this->pager = $this->getServiceObject(PagerManager::class, [], APFService::SERVICE_TYPE_NORMAL);
@@ -126,7 +126,7 @@ private function &getPager() {
/** /**
* @return APFService|GuestbookModel * @return APFService|GuestbookModel
*/ */
protected function &getModel() { protected function getModel() {
return $this->getServiceObject(GuestbookModel::class); return $this->getServiceObject(GuestbookModel::class);
} }
@@ -139,7 +139,7 @@ protected function &getModel() {
* @version * @version
* Version 0.1, 10.05.2009<br /> * Version 0.1, 10.05.2009<br />
*/ */
private function &getMapper() { private function getMapper() {
return $this->getDIServiceObject('APF\modules\guestbook2009\data', 'GuestbookMapper'); return $this->getDIServiceObject('APF\modules\guestbook2009\data', 'GuestbookMapper');
} }
@@ -21,6 +21,7 @@
namespace APF\modules\guestbook2009\pres\controller; namespace APF\modules\guestbook2009\pres\controller;
use APF\core\pagecontroller\BaseDocumentController; use APF\core\pagecontroller\BaseDocumentController;
use APF\core\service\APFDIService;
use APF\modules\guestbook2009\biz\GuestbookService; use APF\modules\guestbook2009\biz\GuestbookService;
/** /**
@@ -33,9 +34,9 @@
abstract class GuestbookBaseController extends BaseDocumentController { abstract class GuestbookBaseController extends BaseDocumentController {
/** /**
* @return GuestbookService The instance of the guestbook service. * @return APFDIService|GuestbookService
*/ */
protected function &getGuestbookService() { protected function getGuestbookService() {
return $this->getDIServiceObject('APF\modules\guestbook2009\biz', 'GuestbookService'); return $this->getDIServiceObject('APF\modules\guestbook2009\biz', 'GuestbookService');
} }
@@ -234,7 +234,7 @@ public function saveApplication(UmgtApplication &$app) {
* Version 0.2, 16.03.2010 (Bug fix 299: moved the service type to the GORM factory call)<br /> * Version 0.2, 16.03.2010 (Bug fix 299: moved the service type to the GORM factory call)<br />
* Version 0.1, 25.08.2011 (Switched to DI configuration)<br /> * Version 0.1, 25.08.2011 (Switched to DI configuration)<br />
*/ */
public function &getORMapper() { public function getORMapper() {
return $this->orm; return $this->orm;
} }
@@ -87,7 +87,7 @@ public function __construct() {
* *
* @return UserDependentContentConditionSet This instance for further usage. * @return UserDependentContentConditionSet This instance for further usage.
*/ */
public function &addCondition(UserDependentContentCondition $condition) { public function addCondition(UserDependentContentCondition $condition) {
$this->conditions[] = $condition; $this->conditions[] = $condition;
return $this; return $this;
@@ -81,7 +81,7 @@ protected function getManager() {
* @version * @version
* Version 0.1, 05.06.2010<br /> * Version 0.1, 05.06.2010<br />
*/ */
protected function &getIcon(TemplateTag $template) { protected function getIcon(TemplateTag $template) {
foreach ($template->getChildren() as &$child) { foreach ($template->getChildren() as &$child) {
if ($child instanceof UmgtMediaInclusionTag) { if ($child instanceof UmgtMediaInclusionTag) {
return $child; return $child;
@@ -34,7 +34,7 @@ public function setFrontController(FrontController $frontController) {
$this->frontController = $frontController; $this->frontController = $frontController;
} }
protected function &getFrontController() { protected function getFrontController() {
return $this->frontController; return $this->frontController;
} }
@@ -34,7 +34,7 @@ public function setFrontController(FrontController $frontController) {
$this->frontController = $frontController; $this->frontController = $frontController;
} }
protected function &getFrontController() { protected function getFrontController() {
return $this->frontController; return $this->frontController;
} }
@@ -46,7 +46,7 @@ protected function getButton() {
* *
* @return HtmlFormTag * @return HtmlFormTag
*/ */
protected function &getForm($method) { protected function getForm($method) {
$form = new HtmlFormTag(); $form = new HtmlFormTag();
$form->setAttribute('name', 'test-form'); $form->setAttribute('name', 'test-form');
@@ -30,7 +30,7 @@ class CheckBoxTagTest extends TestCase {
const BUTTON_NAME = 'send'; const BUTTON_NAME = 'send';
const BUTTON_VALUE = 'Send'; const BUTTON_VALUE = 'Send';
protected function &getForm() { protected function getForm() {
$form = new HtmlFormTag(); $form = new HtmlFormTag();
$form->setAttribute('name', 'test-form'); $form->setAttribute('name', 'test-form');
@@ -103,7 +103,7 @@ public function testFormSubmitChecked() {
* @param bool $checked Whether to att checked="checked" attribute. * @param bool $checked Whether to att checked="checked" attribute.
* @return HtmlFormTag The generated form tag. * @return HtmlFormTag The generated form tag.
*/ */
protected function &getFormWithCheckBox($name, $value, $checked) { protected function getFormWithCheckBox($name, $value, $checked) {
$form = new HtmlFormTag(); $form = new HtmlFormTag();
$form->setAttribute('name', 'test-form'); $form->setAttribute('name', 'test-form');
@@ -46,7 +46,7 @@ protected function getButton() {
* *
* @return HtmlFormTag * @return HtmlFormTag
*/ */
protected function &getForm($method) { protected function getForm($method) {
$form = new HtmlFormTag(); $form = new HtmlFormTag();
$form->setAttribute('name', 'test-form'); $form->setAttribute('name', 'test-form');
@@ -33,7 +33,7 @@ class RadioButtonTagTest extends TestCase {
/** /**
* @return HtmlFormTag * @return HtmlFormTag
*/ */
protected function &getForm() { protected function getForm() {
$form = new HtmlFormTag(); $form = new HtmlFormTag();
$form->setAttribute('name', 'test-form'); $form->setAttribute('name', 'test-form');
@@ -56,7 +56,7 @@ final class CacheManagerFabric extends APFObject {
* Version 0.2, 04.08.2010 (Bug-fix: initializing two cache managers failed due to wrong service mode)<br /> * Version 0.2, 04.08.2010 (Bug-fix: initializing two cache managers failed due to wrong service mode)<br />
* Version 0.3, 24.06.2014 (ID#207: directly injecting configuration instead of re-mapping)<br /> * Version 0.3, 24.06.2014 (ID#207: directly injecting configuration instead of re-mapping)<br />
*/ */
public function &getCacheManager($configSection) { public function getCacheManager($configSection) {
if (!isset($this->cacheManagerCache[$configSection])) { if (!isset($this->cacheManagerCache[$configSection])) {
@@ -66,7 +66,7 @@ public function read(CacheKey $cacheKey) {
* @version * @version
* Version 0.1, 24.11.2008<br /> * Version 0.1, 24.11.2008<br />
*/ */
protected function &getDatabaseConnection() { protected function getDatabaseConnection() {
$connectionKey = $this->getConfigAttribute('Connection'); $connectionKey = $this->getConfigAttribute('Connection');
/* @var $cM ConnectionManager */ /* @var $cM ConnectionManager */
$cM = $this->getServiceObject(ConnectionManager::class); $cM = $this->getServiceObject(ConnectionManager::class);
@@ -41,7 +41,7 @@ interface FormMarker {
* @version * @version
* Version 0.1, 23.08.2014<br /> * Version 0.1, 23.08.2014<br />
*/ */
public function &addContentAfter($content); public function addContentAfter($content);
/** /**
* Allows you to add content (e.g. HTML, text) BEFORE the form marker. * Allows you to add content (e.g. HTML, text) BEFORE the form marker.
@@ -54,5 +54,5 @@ public function &addContentAfter($content);
* @version * @version
* Version 0.1, 23.08.2014<br /> * Version 0.1, 23.08.2014<br />
*/ */
public function &addContentBefore($content); public function addContentBefore($content);
} }
@@ -397,7 +397,7 @@ public function addAttributeToWhiteList($name) {
return $this; return $this;
} }
public function &addAttributesToWhiteList(array $names) { public function addAttributesToWhiteList(array $names) {
$this->attributeWhiteList = array_merge($this->attributeWhiteList, $names); $this->attributeWhiteList = array_merge($this->attributeWhiteList, $names);
return $this; return $this;
@@ -408,7 +408,7 @@ public function getDate() {
* @version * @version
* Version 0.1, 29.08.2009<br /> * Version 0.1, 29.08.2009<br />
*/ */
public function &getDayControl() { public function getDayControl() {
return $this->children['d']; return $this->children['d'];
} }
@@ -421,7 +421,7 @@ public function &getDayControl() {
* @version * @version
* Version 0.1, 29.08.2009<br /> * Version 0.1, 29.08.2009<br />
*/ */
public function &getMonthControl() { public function getMonthControl() {
return $this->children['m']; return $this->children['m'];
} }
@@ -434,7 +434,7 @@ public function &getMonthControl() {
* @version * @version
* Version 0.1, 29.08.2009<br /> * Version 0.1, 29.08.2009<br />
*/ */
public function &getYearControl() { public function getYearControl() {
return $this->children['y']; return $this->children['y'];
} }
@@ -451,7 +451,7 @@ public function &getYearControl() {
* @version * @version
* Version 0.1, 26.07.2011<br /> * Version 0.1, 26.07.2011<br />
*/ */
public function &setValue($value) { public function setValue($value) {
$this->setDate($value); $this->setDate($value);
return $this; return $this;
@@ -40,7 +40,7 @@ public function transform() {
return ''; return '';
} }
public function &addContentBefore($content) { public function addContentBefore($content) {
$objectId = $this->getObjectId(); $objectId = $this->getObjectId();
$this->getParent()->setContent(str_replace( $this->getParent()->setContent(str_replace(
'<' . $objectId . ' />', '<' . $objectId . ' />',
@@ -51,7 +51,7 @@ public function &addContentBefore($content) {
return $this; return $this;
} }
public function &addContentAfter($content) { public function addContentAfter($content) {
$objectId = $this->getObjectId(); $objectId = $this->getObjectId();
$this->getParent()->setContent(str_replace( $this->getParent()->setContent(str_replace(
'<' . $objectId . ' />', '<' . $objectId . ' />',
@@ -71,7 +71,7 @@ public function isSent() {
return false; return false;
} }
public function &hide() { public function hide() {
foreach ($this->children as &$child) { foreach ($this->children as &$child) {
if ($child instanceof FormControl) { if ($child instanceof FormControl) {
$child->hide(); $child->hide();
@@ -95,7 +95,7 @@ public function reset() {
} }
} }
public function &show() { public function show() {
foreach ($this->children as &$child) { foreach ($this->children as &$child) {
if ($child instanceof FormControl) { if ($child instanceof FormControl) {
$child->show(); $child->show();
@@ -91,7 +91,7 @@ public function getValue() {
return $this->getDate(); return $this->getDate();
} }
public function &setValue($value) { public function setValue($value) {
$this->setDate($value); $this->setDate($value);
return $this; return $this;
@@ -91,7 +91,7 @@ public function getValue() {
return $this->getDateTime(); return $this->getDateTime();
} }
public function &setValue($value) { public function setValue($value) {
$this->setDateTime($value); $this->setDateTime($value);
return $this; return $this;
@@ -90,7 +90,7 @@ public function getValue() {
return $this->getMonth(); return $this->getMonth();
} }
public function &setValue($value) { public function setValue($value) {
$this->setMonth($value); $this->setMonth($value);
return $this; return $this;
@@ -91,7 +91,7 @@ public function getValue() {
return $this->getTime(); return $this->getTime();
} }
public function &setValue($value) { public function setValue($value) {
$this->setTime($value); $this->setTime($value);
return $this; return $this;
@@ -92,7 +92,7 @@ public function getValue() {
return $this->getWeek(); return $this->getWeek();
} }
public function &setValue($value) { public function setValue($value) {
$this->setWeek($value); $this->setWeek($value);
return $this; return $this;
@@ -115,7 +115,7 @@ public function setOption2Selected($displayNameOrValue) {
* @version * @version
* Version 0.1, 28.08.2010<br /> * Version 0.1, 28.08.2010<br />
*/ */
public function &getSelectedOption() { public function getSelectedOption() {
/* @var $selectedOption SelectBoxOptionTag */ /* @var $selectedOption SelectBoxOptionTag */
$selectedOption = null; $selectedOption = null;
@@ -139,7 +139,7 @@ public function &getSelectedOption() {
* @version * @version
* Version 0.1, 15.02.2010<br /> * Version 0.1, 15.02.2010<br />
*/ */
public function &getSelectedOptions() { public function getSelectedOptions() {
$selectedOptions = []; $selectedOptions = [];
Oops, something went wrong.

0 comments on commit e3f39a3

Please sign in to comment.
You can’t perform that action at this time.