Commit 3228d1b7 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch '444-donation-throws-exception' into 'develop'

Resolve "Donation throws exception"

Closes #444

See merge request t3o/typo3.org!318
parents 7e346c9f d14bd335
Pipeline #7958 passed with stages
in 5 minutes and 50 seconds
......@@ -6,6 +6,7 @@ use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
/**
......@@ -25,12 +26,12 @@ use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
* Class \T3o\T3oDonation\Controller\DonationController
* @author Sebastian Diez
*/
class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
class DonationController extends ActionController
{
/**
* configurationUtility
*
* @var \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility
* @var \TYPO3\CMS\Core\Configuration\ExtensionConfiguration
* @TYPO3\CMS\Extbase\Annotation\Inject
* @TYPO3\CMS\Extbase\Annotation\ORM\Lazy
*/
......@@ -92,7 +93,7 @@ class DonationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
*/
protected function getConfigurationOption($optionName)
{
$config = $this->configurationUtility->getCurrentConfiguration('t3o_donation');
$config = $this->configurationUtility->get('t3o_donation');
if (!isset($config[$optionName])) {
return '';
}
......
<?php
namespace T3o\T3oDonation\Domain\Model;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
/**
* This file is part of the TYPO3 CMS project.
*
......@@ -18,25 +21,24 @@ namespace T3o\T3oDonation\Domain\Model;
* Class \T3o\T3oDonation\Domain\Model\Account
* @author Sebastian Diez
*/
class Account extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
class Account extends AbstractEntity
{
/**
* @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
* @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
* @var string
*/
protected $name;
/**
* @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
* @TYPO3\CMS\Extbase\Annotation\Validate EmailAddress
* @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
* @TYPO3\CMS\Extbase\Annotation\Validate("EmailAddress")
* @var string
*/
protected $emailNotification;
/**
* @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
* @TYPO3\CMS\Extbase\Annotation\Validate EmailAddress
* @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
* @TYPO3\CMS\Extbase\Annotation\Validate("EmailAddress")
* @var string
*/
protected $emailPaypal;
......
......@@ -2,6 +2,8 @@
namespace T3o\T3oDonation\Domain\Model;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
/**
* This file is part of the TYPO3 CMS project.
*
......@@ -19,7 +21,7 @@ namespace T3o\T3oDonation\Domain\Model;
* Class \T3o\T3oDonation\Domain\Model\Donation
* @author Sebastian Diez
*/
class Donation extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
class Donation extends AbstractEntity
{
/**
* @var bool
......@@ -67,8 +69,8 @@ class Donation extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
protected $addressCountryCode;
/**
* @TYPO3\CMS\Extbase\Annotation\Validate NotEmpty
* @TYPO3\CMS\Extbase\Annotation\Validate EmailAddress
* @TYPO3\CMS\Extbase\Annotation\Validate("NotEmpty")
* @TYPO3\CMS\Extbase\Annotation\Validate("EmailAddress")
* @var string
*/
protected $email;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment