From f8a77f270f24ab7728094664a624880ffe79c6de Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Mon, 23 Dec 2013 13:24:40 +0100 Subject: [PATCH] [CLEANUP] Drop closing PHP tags and do some more minor cleanup. --- Classes/Controller/TestimonialController.php | 3 +- Classes/Domain/Model/Addition.php | 3 +- Classes/Domain/Model/TeaBeverage.php | 4 +- Classes/Domain/Model/TeaType.php | 3 +- Classes/Domain/Model/Testimonial.php | 3 +- .../Repository/TeaBeverageRepository.php | 3 +- .../Repository/TestimonialRepository.php | 3 +- Configuration/TCA/Addition.php | 3 +- Configuration/TCA/TeaBeverage.php | 3 +- Configuration/TCA/TeaType.php | 3 +- Configuration/TCA/Testimonial.php | 3 +- README.md | 2 +- .../Controller/TestimonialControllerTest.php | 5 +- Tests/Unit/Domain/Model/AdditionTest.php | 49 +++++++++---------- Tests/Unit/Domain/Model/TeaBeverageTest.php | 3 +- Tests/Unit/Domain/Model/TeaTypeTest.php | 3 +- Tests/Unit/Domain/Model/TestimonialTest.php | 3 +- .../Repository/TeaBeverageRepositoryTest.php | 3 +- .../Repository/TestimonialRepositoryTest.php | 3 +- ext_emconf.php | 2 - ext_localconf.php | 1 - ext_tables.php | 1 - ext_tables.sql | 2 +- 23 files changed, 44 insertions(+), 67 deletions(-) diff --git a/Classes/Controller/TestimonialController.php b/Classes/Controller/TestimonialController.php index a39dfca..f03c3d7 100644 --- a/Classes/Controller/TestimonialController.php +++ b/Classes/Controller/TestimonialController.php @@ -73,5 +73,4 @@ class TestimonialController extends ActionController { public function setView(ViewInterface $view) { $this->view = $view; } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Classes/Domain/Model/Addition.php b/Classes/Domain/Model/Addition.php index 08b0c32..7243d8b 100644 --- a/Classes/Domain/Model/Addition.php +++ b/Classes/Domain/Model/Addition.php @@ -52,5 +52,4 @@ class Addition extends \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject { public function setTitle($title) { $this->title = $title; } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Classes/Domain/Model/TeaBeverage.php b/Classes/Domain/Model/TeaBeverage.php index 32badeb..c498238 100644 --- a/Classes/Domain/Model/TeaBeverage.php +++ b/Classes/Domain/Model/TeaBeverage.php @@ -180,6 +180,4 @@ class TeaBeverage extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity { public function removeTestimonial(\OliverKlee\Tea\Domain\Model\Testimonial $testimonialToRemove) { $this->testimonials->detach($testimonialToRemove); } - -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Classes/Domain/Model/TeaType.php b/Classes/Domain/Model/TeaType.php index b4d1cd8..099502f 100644 --- a/Classes/Domain/Model/TeaType.php +++ b/Classes/Domain/Model/TeaType.php @@ -80,5 +80,4 @@ class TeaType extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity { public function isCaffeinated() { return $this->getCaffeinated(); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Classes/Domain/Model/Testimonial.php b/Classes/Domain/Model/Testimonial.php index 1ee2c01..e19f325 100644 --- a/Classes/Domain/Model/Testimonial.php +++ b/Classes/Domain/Model/Testimonial.php @@ -93,5 +93,4 @@ class Testimonial extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity { public function setText($text) { $this->text = $text; } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Classes/Domain/Repository/TeaBeverageRepository.php b/Classes/Domain/Repository/TeaBeverageRepository.php index c2ea47a..0fa5149 100644 --- a/Classes/Domain/Repository/TeaBeverageRepository.php +++ b/Classes/Domain/Repository/TeaBeverageRepository.php @@ -31,5 +31,4 @@ namespace OliverKlee\Tea\Domain\Repository; * @author Oliver Klee */ class TeaBeverageRepository extends \TYPO3\CMS\Extbase\Persistence\Repository { -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Classes/Domain/Repository/TestimonialRepository.php b/Classes/Domain/Repository/TestimonialRepository.php index 79e02c4..754306a 100644 --- a/Classes/Domain/Repository/TestimonialRepository.php +++ b/Classes/Domain/Repository/TestimonialRepository.php @@ -31,5 +31,4 @@ namespace OliverKlee\Tea\Domain\Repository; * @author Oliver Klee */ class TestimonialRepository extends \TYPO3\CMS\Extbase\Persistence\Repository { -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Configuration/TCA/Addition.php b/Configuration/TCA/Addition.php index 79580fc..77d020f 100644 --- a/Configuration/TCA/Addition.php +++ b/Configuration/TCA/Addition.php @@ -103,5 +103,4 @@ $TCA['tx_tea_domain_model_addition'] = array( ), ), ), -); -?> \ No newline at end of file +); \ No newline at end of file diff --git a/Configuration/TCA/TeaBeverage.php b/Configuration/TCA/TeaBeverage.php index 82e96eb..df33144 100644 --- a/Configuration/TCA/TeaBeverage.php +++ b/Configuration/TCA/TeaBeverage.php @@ -166,5 +166,4 @@ $TCA['tx_tea_domain_model_teabeverage'] = array( ), ), ), -); -?> \ No newline at end of file +); \ No newline at end of file diff --git a/Configuration/TCA/TeaType.php b/Configuration/TCA/TeaType.php index 5c060e7..2cfa966 100644 --- a/Configuration/TCA/TeaType.php +++ b/Configuration/TCA/TeaType.php @@ -111,5 +111,4 @@ $TCA['tx_tea_domain_model_teatype'] = array( ), ), ), -); -?> \ No newline at end of file +); \ No newline at end of file diff --git a/Configuration/TCA/Testimonial.php b/Configuration/TCA/Testimonial.php index 4c4a9df..c7e4c10 100644 --- a/Configuration/TCA/Testimonial.php +++ b/Configuration/TCA/Testimonial.php @@ -130,5 +130,4 @@ $TCA['tx_tea_domain_model_testimonial'] = array( ), ), ), -); -?> \ No newline at end of file +); \ No newline at end of file diff --git a/README.md b/README.md index 8fbe95b..e291832 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Tea example =========== -This extension serves as an example on how to unit-test different data types and relation types in TYPO3 extensions. \ No newline at end of file +This extension serves as an example on how to unit-test different data types and relation types in TYPO3 extensions. diff --git a/Tests/Unit/Controller/TestimonialControllerTest.php b/Tests/Unit/Controller/TestimonialControllerTest.php index 556d8e6..4004313 100644 --- a/Tests/Unit/Controller/TestimonialControllerTest.php +++ b/Tests/Unit/Controller/TestimonialControllerTest.php @@ -40,7 +40,7 @@ class TestimonialControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCa /** * @var TestimonialController */ - protected $subject; + protected $subject = NULL; /** * @var ViewInterface @@ -87,5 +87,4 @@ class TestimonialControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCa $this->subject->indexAction(); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Tests/Unit/Domain/Model/AdditionTest.php b/Tests/Unit/Domain/Model/AdditionTest.php index 672013f..7dcde51 100644 --- a/Tests/Unit/Domain/Model/AdditionTest.php +++ b/Tests/Unit/Domain/Model/AdditionTest.php @@ -1,29 +1,29 @@ , oliverklee.de - * - * All rights reserved - * - * This script is part of the TYPO3 project. The TYPO3 project is - * free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The GNU General Public License can be found at - * http://www.gnu.org/copyleft/gpl.html. - * - * This script is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * This copyright notice MUST APPEAR in all copies of the script! - ***************************************************************/ +/*************************************************************** + * Copyright notice + * + * (c) 2013 Oliver Klee , oliverklee.de + * + * All rights reserved + * + * This script is part of the TYPO3 project. The TYPO3 project is + * free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * The GNU General Public License can be found at + * http://www.gnu.org/copyleft/gpl.html. + * + * This script is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * This copyright notice MUST APPEAR in all copies of the script! + ***************************************************************/ /** * Test case. @@ -65,5 +65,4 @@ class AdditionTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase { $this->subject->getTitle() ); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Tests/Unit/Domain/Model/TeaBeverageTest.php b/Tests/Unit/Domain/Model/TeaBeverageTest.php index f921208..f4dd1eb 100644 --- a/Tests/Unit/Domain/Model/TeaBeverageTest.php +++ b/Tests/Unit/Domain/Model/TeaBeverageTest.php @@ -195,5 +195,4 @@ class TeaBeverageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase { $this->subject->getTestimonials()->contains($newItem) ); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Tests/Unit/Domain/Model/TeaTypeTest.php b/Tests/Unit/Domain/Model/TeaTypeTest.php index 90ce009..93c153e 100644 --- a/Tests/Unit/Domain/Model/TeaTypeTest.php +++ b/Tests/Unit/Domain/Model/TeaTypeTest.php @@ -86,5 +86,4 @@ class TeaTypeTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase { $this->subject->getCaffeinated() ); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Tests/Unit/Domain/Model/TestimonialTest.php b/Tests/Unit/Domain/Model/TestimonialTest.php index 834682b..2ea6ed8 100644 --- a/Tests/Unit/Domain/Model/TestimonialTest.php +++ b/Tests/Unit/Domain/Model/TestimonialTest.php @@ -109,5 +109,4 @@ class TestimonialTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase { $this->subject->getText() ); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php index 89998c0..34b691b 100644 --- a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php +++ b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php @@ -59,5 +59,4 @@ class TeaBeverageRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCa $this->subject ); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php index 17c2987..185d73b 100644 --- a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php +++ b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php @@ -59,5 +59,4 @@ class TestimonialRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCa $this->subject ); } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/ext_emconf.php b/ext_emconf.php index 23269b3..23a8f93 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -40,5 +40,3 @@ $EM_CONF[$_EXTKEY] = array( ), ), ); - -?> \ No newline at end of file diff --git a/ext_localconf.php b/ext_localconf.php index ea45893..ca52d4a 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -15,4 +15,3 @@ if (!defined('TYPO3_MODE')) { 'Testimonial' => 'index', ) ); -?> \ No newline at end of file diff --git a/ext_tables.php b/ext_tables.php index e29b376..cd763c4 100644 --- a/ext_tables.php +++ b/ext_tables.php @@ -134,4 +134,3 @@ $TCA['tx_tea_domain_model_testimonial'] = array( 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/tx_tea_domain_model_testimonial.gif' ), ); -?> \ No newline at end of file diff --git a/ext_tables.sql b/ext_tables.sql index 527b60e..92d5fc5 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -169,4 +169,4 @@ CREATE TABLE tx_tea_teabeverage_addition_mm ( KEY uid_local (uid_local), KEY uid_foreign (uid_foreign) -); \ No newline at end of file +);