kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-18 20:38:57 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2014-12-13 21:59:02 +01:00
parent c77b43458e
commit 3cfa3f3b27
67 changed files with 651 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/lib/FireflyIII/Shared/Facade/DateKit.php
View File

@@ -4,10 +4,18 @@ namespace FireflyIII\Shared\Facade;
use Illuminate\Support\Facades\Facade;
/**
* Class DateKit
*
* @package FireflyIII\Shared\Facade
*/
class DateKit extends Facade
{
/**
* @return string
*/
protected static function getFacadeAccessor()
{
return 'datekit';

8
app/lib/FireflyIII/Shared/Facade/FFForm.php
View File

@@ -4,10 +4,18 @@ namespace FireflyIII\Shared\Facade;
use Illuminate\Support\Facades\Facade;
/**
* Class FFForm
*
* @package FireflyIII\Shared\Facade
*/
class FFForm extends Facade
{
/**
* @return string
*/
protected static function getFacadeAccessor()
{
return 'ffform';

8
app/lib/FireflyIII/Shared/Facade/Filter.php
View File

@@ -4,10 +4,18 @@ namespace FireflyIII\Shared\Facade;
use Illuminate\Support\Facades\Facade;
/**
* Class Filter
*
* @package FireflyIII\Shared\Facade
*/
class Filter extends Facade
{
/**
* @return string
*/
protected static function getFacadeAccessor()
{
return 'filter';

8
app/lib/FireflyIII/Shared/Facade/Navigation.php
View File

@@ -4,10 +4,18 @@ namespace FireflyIII\Shared\Facade;
use Illuminate\Support\Facades\Facade;
/**
* Class Navigation
*
* @package FireflyIII\Shared\Facade
*/
class Navigation extends Facade
{
/**
* @return string
*/
protected static function getFacadeAccessor()
{
return 'navigation';

8
app/lib/FireflyIII/Shared/Facade/Reminders.php
View File

@@ -4,10 +4,18 @@ namespace FireflyIII\Shared\Facade;
use Illuminate\Support\Facades\Facade;
/**
* Class Reminders
*
* @package FireflyIII\Shared\Facade
*/
class Reminders extends Facade
{
/**
* @return string
*/
protected static function getFacadeAccessor()
{
return 'reminders';

8
app/lib/FireflyIII/Shared/Facade/Steam.php
View File

@@ -4,10 +4,18 @@ namespace FireflyIII\Shared\Facade;
use Illuminate\Support\Facades\Facade;
/**
* Class Steam
*
* @package FireflyIII\Shared\Facade
*/
class Steam extends Facade
{
/**
* @return string
*/
protected static function getFacadeAccessor()
{
return 'steam';

16
app/lib/FireflyIII/Shared/Mail/Registration.php
View File

@@ -1,5 +1,6 @@
<?php
namespace FireflyIII\Shared\Mail;
use Swift_RfcComplianceException;
/**
@@ -28,10 +29,11 @@ class Registration implements RegistrationInterface
try {
\Mail::send(
['emails.user.register-html', 'emails.user.register-text'], $data, function ($message) use ($email) {
$message->to($email, $email)->subject('Welcome to Firefly!');
}
$message->to($email, $email)->subject('Welcome to Firefly!');
}
);
} catch(Swift_RfcComplianceException $e) {}
} catch (Swift_RfcComplianceException $e) {
}
}
/**
@@ -49,8 +51,8 @@ class Registration implements RegistrationInterface
$data = ['reset' => $reset];
\Mail::send(
['emails.user.remindme-html', 'emails.user.remindme-text'], $data, function ($message) use ($email) {
$message->to($email, $email)->subject('Forgot your password?');
}
$message->to($email, $email)->subject('Forgot your password?');
}
);
@@ -72,8 +74,8 @@ class Registration implements RegistrationInterface
\Mail::send(
['emails.user.verify-html', 'emails.user.verify-text'], $data, function ($message) use ($email) {
$message->to($email, $email)->subject('Verify your e-mail address.');
}
$message->to($email, $email)->subject('Verify your e-mail address.');
}
);
}

14
app/lib/FireflyIII/Shared/SingleTableInheritanceEntity.php
View File

@@ -13,13 +13,10 @@ abstract class SingleTableInheritanceEntity extends \Eloquent
*
* @var bool
*/
protected $isSubclass = false;
/**
* The field that stores the subclass
*
* @var string
*/
// @codingStandardsIgnoreStart
protected $isSubclass = false;
protected $subclassField = null;
// @codingStandardsIgnoreEnd
/**
* @param array $attributes
@@ -77,9 +74,8 @@ abstract class SingleTableInheritanceEntity extends \Eloquent
*
* @return bool
*/
public function save(
array $rules = [], array $customMessages = [], array $options = [], \Closure $beforeSave = null, \Closure $afterSave = null
) {
public function save(array $rules = [], array $customMessages = [], array $options = [], \Closure $beforeSave = null, \Closure $afterSave = null)
{
if ($this->subclassField) {
$this->attributes[$this->subclassField] = get_class($this);
}

10
app/lib/FireflyIII/Shared/Toolkit/Date.php
View File

@@ -143,6 +143,13 @@ class Date
return $currentEnd;
}
/**
* @param Carbon $date
* @param $repeatFrequency
*
* @return string
* @throws FireflyException
*/
public function periodShow(Carbon $date, $repeatFrequency)
{
switch ($repeatFrequency) {
@@ -216,12 +223,13 @@ class Date
}
/**
* @param Carbon $date
* @param Carbon $theDate
* @param $repeatFreq
* @param int $subtract
*
* @return Carbon
* @throws FireflyException
* @internal param Carbon $date
*/
public function subtractPeriod(Carbon $theDate, $repeatFreq, $subtract = 1)
{

7
app/lib/FireflyIII/Shared/Validation/FireflyValidator.php
View File

@@ -10,6 +10,13 @@ use Illuminate\Validation\Validator;
*/
class FireflyValidator extends Validator
{
/**
* @param $attribute
* @param $value
* @param $parameters
*
* @return bool
*/
public function validateAlphabasic($attribute, $value, $parameters)
{
$pattern = '/[^[:alnum:]_\-\.\& \(\)\'"]/iu';