diff --git a/.gitignore b/.gitignore index b296f9e59..46d1b6c4f 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ mixwatch.log laravel-echo-server.lock ziggy.js .php_cs.cache +.php-cs-fixer.cache dump.html report.html /resources/sass/_variables_*.scss diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index a31304a4d..11a7a7563 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -42,7 +42,6 @@ 'extra', 'throw', 'use', - 'use_trait', ], ], 'no_blank_lines_after_class_opening' => true, @@ -127,15 +126,15 @@ ], 'class_attributes_separation' => [ 'elements' => [ - 'const' => 'one', + 'const' => 'only_if_meta', 'method' => 'one', 'property' => 'one', ], ], 'class_definition' => [ 'multi_line_extends_each_single_line' => true, - 'single_item_single_line' => true, - 'single_line' => true, + 'single_item_single_line' => false, + 'single_line' => false, ], 'ordered_imports' => [ 'sort_algorithm' => 'alpha', @@ -156,12 +155,12 @@ $finder = Finder::create() ->in([ - __DIR__.'/app', - __DIR__.'/config', - __DIR__.'/database', - __DIR__.'/resources', - __DIR__.'/routes', - __DIR__.'/tests', + __DIR__ . '/app', + __DIR__ . '/config', + // __DIR__ . '/database', + // __DIR__ . '/resources', + __DIR__ . '/routes', + // __DIR__ . '/tests', ]) ->name('*.php') ->notName('*.blade.php') diff --git a/app/HMS/Auth/FileBasedPasswordStore.php b/app/HMS/Auth/FileBasedPasswordStore.php index 1d08f6274..3679469be 100644 --- a/app/HMS/Auth/FileBasedPasswordStore.php +++ b/app/HMS/Auth/FileBasedPasswordStore.php @@ -8,6 +8,7 @@ class FileBasedPasswordStore implements PasswordStore { protected $usersFile; + protected $users; /** diff --git a/app/HMS/Entities/Banking/Account.php b/app/HMS/Entities/Banking/Account.php index 907e83e92..9ffd0ef36 100644 --- a/app/HMS/Entities/Banking/Account.php +++ b/app/HMS/Entities/Banking/Account.php @@ -9,7 +9,7 @@ class Account /** * Maximum length for a Payment reference. */ - const MAX_REFERENCE_LENGHT = 16; + public const MAX_REFERENCE_LENGHT = 16; /** * @var int diff --git a/app/HMS/Entities/Banking/BankType.php b/app/HMS/Entities/Banking/BankType.php index 3150391ec..0d4e6c0ec 100644 --- a/app/HMS/Entities/Banking/BankType.php +++ b/app/HMS/Entities/Banking/BankType.php @@ -7,22 +7,22 @@ abstract class BankType /* * Fully Automatic bank where new transactions are uploaded via the api endpoint */ - const AUTOMATIC = 'AUTOMATIC'; + public const AUTOMATIC = 'AUTOMATIC'; /* * Transactions are manually entered (via web interface) record of a payment or purchase or via the api. */ - const MANUAL = 'MANUAL'; + public const MANUAL = 'MANUAL'; /* * Special case MANUAL to represent petty cash account. */ - const CASH = 'CASH'; + public const CASH = 'CASH'; /** * String representation of types for display. */ - const TYPE_STRINGS = [ + public const TYPE_STRINGS = [ self::AUTOMATIC => 'Automatic', self::MANUAL => 'Manual', self::CASH => 'Cash', diff --git a/app/HMS/Entities/Banking/MembershipStatusNotification.php b/app/HMS/Entities/Banking/MembershipStatusNotification.php index 82b957700..1a85c1212 100644 --- a/app/HMS/Entities/Banking/MembershipStatusNotification.php +++ b/app/HMS/Entities/Banking/MembershipStatusNotification.php @@ -10,17 +10,17 @@ class MembershipStatusNotification /** * The Notification was cleared due to a payment before membership was revoked. */ - const PAYMENT = 'PAYMENT'; + public const PAYMENT = 'PAYMENT'; /** * The Notification was cleared when the membership was revoked. */ - const REVOKED = 'REVOKED'; + public const REVOKED = 'REVOKED'; /** * The Notification was cleared manually, likely due to audit issues. */ - const MANUAL = 'MANUAL'; + public const MANUAL = 'MANUAL'; /** * @var int diff --git a/app/HMS/Entities/Banking/Stripe/ChargeType.php b/app/HMS/Entities/Banking/Stripe/ChargeType.php index 80c6d1779..68e04fa1b 100644 --- a/app/HMS/Entities/Banking/Stripe/ChargeType.php +++ b/app/HMS/Entities/Banking/Stripe/ChargeType.php @@ -7,17 +7,17 @@ abstract class ChargeType /* * Payment for Snackspace. */ - const SNACKSPACE = 'SNACKSPACE'; + public const SNACKSPACE = 'SNACKSPACE'; /* * Donation to the space. */ - const DONATION = 'DONATION'; + public const DONATION = 'DONATION'; /** * String representation of types for display. */ - const TYPE_STRINGS = [ + public const TYPE_STRINGS = [ self::SNACKSPACE => 'Snackspace', self::DONATION => 'Donation', ]; diff --git a/app/HMS/Entities/ContentBlockType.php b/app/HMS/Entities/ContentBlockType.php index 86d9a3544..cf6a012ed 100644 --- a/app/HMS/Entities/ContentBlockType.php +++ b/app/HMS/Entities/ContentBlockType.php @@ -7,17 +7,17 @@ abstract class ContentBlockType /* * Blade view */ - const PAGE = 'PAGE'; + public const PAGE = 'PAGE'; /* * Markdown view */ - const EMAIL = 'EMAIL'; + public const EMAIL = 'EMAIL'; /** * String representation of types for display. */ - const TYPE_STRINGS = [ + public const TYPE_STRINGS = [ self::PAGE => 'Page', self::EMAIL => 'Email', ]; diff --git a/app/HMS/Entities/Gatekeeper/AccessLogResult.php b/app/HMS/Entities/Gatekeeper/AccessLogResult.php index 7a8ed6d25..c1f67d79e 100644 --- a/app/HMS/Entities/Gatekeeper/AccessLogResult.php +++ b/app/HMS/Entities/Gatekeeper/AccessLogResult.php @@ -7,17 +7,17 @@ abstract class AccessLogResult /** * Access was denied. */ - const ACCESS_DENIED = 10; + public const ACCESS_DENIED = 10; /** * Access was granted. */ - const ACCESS_GRANTED = 20; + public const ACCESS_GRANTED = 20; /** * String representation of states for display. */ - const RESULT_STRINGS = + public const RESULT_STRINGS = [ self::ACCESS_DENIED => 'Denied', self::ACCESS_GRANTED => 'Granted', diff --git a/app/HMS/Entities/Gatekeeper/BookableAreaBookingColor.php b/app/HMS/Entities/Gatekeeper/BookableAreaBookingColor.php index 2994384dc..808840b3c 100644 --- a/app/HMS/Entities/Gatekeeper/BookableAreaBookingColor.php +++ b/app/HMS/Entities/Gatekeeper/BookableAreaBookingColor.php @@ -4,19 +4,19 @@ abstract class BookableAreaBookingColor { - const PRIMARY = 'primary'; - const GREEN = 'green'; - const RED = 'red'; - const INDIGO = 'indigo'; - const YELLOW = 'yellow'; - const PINK = 'pink'; - const ORANGE = 'orange'; - const CYAN = 'cyan'; + public const PRIMARY = 'primary'; + public const GREEN = 'green'; + public const RED = 'red'; + public const INDIGO = 'indigo'; + public const YELLOW = 'yellow'; + public const PINK = 'pink'; + public const ORANGE = 'orange'; + public const CYAN = 'cyan'; /** * String representation of states for display. */ - const COLOR_STRINGS = [ + public const COLOR_STRINGS = [ self::PRIMARY => 'Hackspace Green', self::GREEN => 'Green', self::RED => 'Red', diff --git a/app/HMS/Entities/Gatekeeper/BuildingAccessState.php b/app/HMS/Entities/Gatekeeper/BuildingAccessState.php index c76530512..53be54858 100644 --- a/app/HMS/Entities/Gatekeeper/BuildingAccessState.php +++ b/app/HMS/Entities/Gatekeeper/BuildingAccessState.php @@ -7,27 +7,27 @@ abstract class BuildingAccessState /** * The building is fully open to all members, they can come and go 24/7. */ - const FULL_OPEN = 'FULL_OPEN'; + public const FULL_OPEN = 'FULL_OPEN'; /** * Members need to self book access to enter the building. */ - const SELF_BOOK = 'SELF_BOOK'; + public const SELF_BOOK = 'SELF_BOOK'; /** * Members can request an access slot booking, which needs approval before they can enter the building. */ - const REQUESTED_BOOK = 'REQUESTED_BOOK'; + public const REQUESTED_BOOK = 'REQUESTED_BOOK'; /** * The building is closed to all but Trustees. They may grant access to others. */ - const CLOSED = 'CLOSED'; + public const CLOSED = 'CLOSED'; /** * String representation of states for display. */ - const STATE_STRINGS = [ + public const STATE_STRINGS = [ self::FULL_OPEN => 'Fully open', self::SELF_BOOK => 'Self booked access', self::REQUESTED_BOOK => 'Requested access', diff --git a/app/HMS/Entities/Gatekeeper/Pin.php b/app/HMS/Entities/Gatekeeper/Pin.php index fcc414506..137337817 100644 --- a/app/HMS/Entities/Gatekeeper/Pin.php +++ b/app/HMS/Entities/Gatekeeper/Pin.php @@ -11,22 +11,27 @@ class Pin * @var int */ protected $id; + /** * @var string */ protected $pin; + /** * @var Carbon */ protected $dateAdded; + /** * @var Carbon */ protected $expiry; + /** * @var int */ protected $state; + /** * @var User */ diff --git a/app/HMS/Entities/Gatekeeper/PinState.php b/app/HMS/Entities/Gatekeeper/PinState.php index c47bb7298..e74b13ba9 100644 --- a/app/HMS/Entities/Gatekeeper/PinState.php +++ b/app/HMS/Entities/Gatekeeper/PinState.php @@ -7,27 +7,27 @@ abstract class PinState /** * This pin can be used for entry (up until the expiry date), cannot be used to register a card. */ - const ACTIVE = 10; + public const ACTIVE = 10; /** * Pin has expired and can no longer be used for entry. */ - const EXPIRED = 20; + public const EXPIRED = 20; /** * This pin cannot be used for entry, and has likely been used to activate an RFID card. */ - const CANCELLED = 30; + public const CANCELLED = 30; /** * This pin may be used to enrol an RFID card. */ - const ENROLL = 40; + public const ENROLL = 40; /** * String representation of states for display. */ - const STATE_STRINGS = + public const STATE_STRINGS = [ self::ACTIVE => 'Active', self::EXPIRED => 'Expired', diff --git a/app/HMS/Entities/Gatekeeper/RfidTagState.php b/app/HMS/Entities/Gatekeeper/RfidTagState.php index 45e251cae..6cedac721 100644 --- a/app/HMS/Entities/Gatekeeper/RfidTagState.php +++ b/app/HMS/Entities/Gatekeeper/RfidTagState.php @@ -7,22 +7,22 @@ abstract class RfidTagState /** * This RfidTag can be used for entry (up until the expiry date), cannot be used to register a card. */ - const ACTIVE = 10; + public const ACTIVE = 10; /** * RfidTag has been destroyed and can no longer be used for entry. */ - const EXPIRED = 20; + public const EXPIRED = 20; /** * RfidTag has been lost and can no longer be used for entry. */ - const LOST = 30; + public const LOST = 30; /** * String representation of states for display. */ - const STATE_STRINGS = + public const STATE_STRINGS = [ self::ACTIVE => 'Active', self::EXPIRED => 'Destroyed', diff --git a/app/HMS/Entities/Gatekeeper/Zone.php b/app/HMS/Entities/Gatekeeper/Zone.php index 4534b804c..071057141 100644 --- a/app/HMS/Entities/Gatekeeper/Zone.php +++ b/app/HMS/Entities/Gatekeeper/Zone.php @@ -6,7 +6,7 @@ class Zone { - const OFF_SITE = 'Off-site'; + public const OFF_SITE = 'Off-site'; /** * @var int diff --git a/app/HMS/Entities/Instrumentation/EventType.php b/app/HMS/Entities/Instrumentation/EventType.php index 552150121..1d299769d 100644 --- a/app/HMS/Entities/Instrumentation/EventType.php +++ b/app/HMS/Entities/Instrumentation/EventType.php @@ -4,30 +4,21 @@ abstract class EventType { - const LAST_OUT = 'LAST_OUT'; - - const FIRST_IN = 'FIRST_IN'; - - const DOOR_OPENED = 'DOOR_OPENED'; - - const DOOR_CLOSED = 'DOOR_CLOSED'; - - const DOOR_TIMEOUT = 'DOOR_TIMEOUT'; - - const DOORBELL = 'DOORBELL'; - - const PROCESS_RESTART = 'PROCESS_RESTART'; - - const WARN = 'WARN'; - - const DOOR_LOCKED = 'DOOR_LOCKED'; - - const UNKNOWN = 'UNKNOWN'; + public const LAST_OUT = 'LAST_OUT'; + public const FIRST_IN = 'FIRST_IN'; + public const DOOR_OPENED = 'DOOR_OPENED'; + public const DOOR_CLOSED = 'DOOR_CLOSED'; + public const DOOR_TIMEOUT = 'DOOR_TIMEOUT'; + public const DOORBELL = 'DOORBELL'; + public const PROCESS_RESTART = 'PROCESS_RESTART'; + public const WARN = 'WARN'; + public const DOOR_LOCKED = 'DOOR_LOCKED'; + public const UNKNOWN = 'UNKNOWN'; /** * String representation of types for display. */ - const TYPE_STRINGS = [ + public const TYPE_STRINGS = [ self::LAST_OUT => 'Last Out', self::FIRST_IN => 'First In', self::DOOR_OPENED => 'Door Opened', diff --git a/app/HMS/Entities/Members/BoxState.php b/app/HMS/Entities/Members/BoxState.php index 7e8351145..a1539cecf 100644 --- a/app/HMS/Entities/Members/BoxState.php +++ b/app/HMS/Entities/Members/BoxState.php @@ -7,22 +7,22 @@ class BoxState /** * This box is considered active and being used. */ - const INUSE = 10; + public const INUSE = 10; /** * Box has been removed from the hackspace. */ - const REMOVED = 20; + public const REMOVED = 20; /** * Box has been identified as abandoned and not beeing worked on. */ - const ABANDONED = 30; + public const ABANDONED = 30; /** * String representation of states for display. */ - const STATE_STRINGS = + public const STATE_STRINGS = [ self::INUSE => 'In Use', self::REMOVED => 'Removed', diff --git a/app/HMS/Entities/Members/Project.php b/app/HMS/Entities/Members/Project.php index 4985a0ff2..05b33eb79 100644 --- a/app/HMS/Entities/Members/Project.php +++ b/app/HMS/Entities/Members/Project.php @@ -10,7 +10,7 @@ class Project /** * Length of the trimmed description. */ - const TRIMMED_LENGHT = 100; + public const TRIMMED_LENGHT = 100; /** * @var int diff --git a/app/HMS/Entities/Members/ProjectState.php b/app/HMS/Entities/Members/ProjectState.php index cd8ea801c..e3464bd9e 100644 --- a/app/HMS/Entities/Members/ProjectState.php +++ b/app/HMS/Entities/Members/ProjectState.php @@ -7,22 +7,22 @@ class ProjectState /** * This project is considered active and being worked on. */ - const ACTIVE = 10; + public const ACTIVE = 10; /** * Project has been finished/removed from the hackspace. */ - const COMPLETE = 20; + public const COMPLETE = 20; /** * Project has been identified as abandoned and not beeing worked on. */ - const ABANDONED = 30; + public const ABANDONED = 30; /** * String representation of states for display. */ - const STATE_STRINGS = + public const STATE_STRINGS = [ self::ACTIVE => 'Active', self::COMPLETE => 'Complete', diff --git a/app/HMS/Entities/Membership/RejectedLog.php b/app/HMS/Entities/Membership/RejectedLog.php index 7d9601bd6..846698716 100644 --- a/app/HMS/Entities/Membership/RejectedLog.php +++ b/app/HMS/Entities/Membership/RejectedLog.php @@ -19,14 +19,17 @@ class RejectedLog * @var User */ protected $user; + /** * @var string */ protected $reason; + /** * @var User */ protected $rejectedBy; + /** * @var Carbon|null */ diff --git a/app/HMS/Entities/Role.php b/app/HMS/Entities/Role.php index 3a11ea951..0e32e2713 100644 --- a/app/HMS/Entities/Role.php +++ b/app/HMS/Entities/Role.php @@ -14,15 +14,21 @@ class Role implements RoleContract { use HasPermissions, SoftDeletable, Timestampable, Notifiable; - const MEMBER_CURRENT = 'member.current'; - const MEMBER_APPROVAL = 'member.approval'; - const MEMBER_PAYMENT = 'member.payment'; - const MEMBER_YOUNG = 'member.young'; - const MEMBER_EX = 'member.ex'; - const MEMBER_TEMPORARYBANNED = 'member.temporarybanned'; - const MEMBER_BANNED = 'member.banned'; - - const MEMBER_ROLES = [ + /* + * Member roles names. + */ + public const MEMBER_CURRENT = 'member.current'; + public const MEMBER_APPROVAL = 'member.approval'; + public const MEMBER_PAYMENT = 'member.payment'; + public const MEMBER_YOUNG = 'member.young'; + public const MEMBER_EX = 'member.ex'; + public const MEMBER_TEMPORARYBANNED = 'member.temporarybanned'; + public const MEMBER_BANNED = 'member.banned'; + + /* + * Member roles. + */ + public const MEMBER_ROLES = [ self::MEMBER_CURRENT, self::MEMBER_APPROVAL, self::MEMBER_PAYMENT, @@ -32,19 +38,21 @@ class Role implements RoleContract self::MEMBER_BANNED, ]; - const SUPERUSER = 'user.super'; - const TEMPORARY_ACCESS = 'user.temporaryAccess'; - const BUILDING_ACCESS = 'user.buildingAccess'; - - const TEAM_MEMBERSHIP = 'team.membership'; - const TEAM_TRUSTEES = 'team.trustees'; - const TEAM_SOFTWARE = 'team.software'; - const TEAM_FINANCE = 'team.finance'; + /** + * Role names. + */ + public const SUPERUSER = 'user.super'; + public const TEMPORARY_ACCESS = 'user.temporaryAccess'; + public const BUILDING_ACCESS = 'user.buildingAccess'; + public const TEAM_MEMBERSHIP = 'team.membership'; + public const TEAM_TRUSTEES = 'team.trustees'; + public const TEAM_SOFTWARE = 'team.software'; + public const TEAM_FINANCE = 'team.finance'; /** * Length of the trimmed description. */ - const TRIMMED_LENGHT = 100; + public const TRIMMED_LENGHT = 100; /** * @var int diff --git a/app/HMS/Entities/Snackspace/Product.php b/app/HMS/Entities/Snackspace/Product.php index 051a9514b..0cffa8f0c 100644 --- a/app/HMS/Entities/Snackspace/Product.php +++ b/app/HMS/Entities/Snackspace/Product.php @@ -7,8 +7,8 @@ class Product { // avaliblity - const AVAILABLE = 1; - const UNAVAILABLE = 0; + public const AVAILABLE = 1; + public const UNAVAILABLE = 0; /** * @var int diff --git a/app/HMS/Entities/Snackspace/TransactionState.php b/app/HMS/Entities/Snackspace/TransactionState.php index 923db1ffc..e1de54b42 100644 --- a/app/HMS/Entities/Snackspace/TransactionState.php +++ b/app/HMS/Entities/Snackspace/TransactionState.php @@ -4,7 +4,7 @@ abstract class TransactionState { - const COMPLETE = 'COMPLETE'; - const PENDING = 'PENDING'; - const ABORTED = 'ABORTED'; + public const COMPLETE = 'COMPLETE'; + public const PENDING = 'PENDING'; + public const ABORTED = 'ABORTED'; } diff --git a/app/HMS/Entities/Snackspace/TransactionType.php b/app/HMS/Entities/Snackspace/TransactionType.php index 41aec22a0..b533fb7cc 100644 --- a/app/HMS/Entities/Snackspace/TransactionType.php +++ b/app/HMS/Entities/Snackspace/TransactionType.php @@ -7,47 +7,47 @@ abstract class TransactionType /* * Vending machine purchase. */ - const VEND = 'VEND'; + public const VEND = 'VEND'; /* * Transaction is a manually entered (via web interface) record of a payment or purchase. */ - const MANUAL = 'MANUAL'; + public const MANUAL = 'MANUAL'; /* * Tool usage. */ - const TOOL = 'TOOL'; + public const TOOL = 'TOOL'; /* * Purchase of a members box. */ - const MEMBER_BOX = 'BOX'; + public const MEMBER_BOX = 'BOX'; /* * Payment received by cash acceptor. */ - const CASH_PAYMENT = 'CASHPAYMENT'; + public const CASH_PAYMENT = 'CASHPAYMENT'; /* * Payment made on-line (stripe). */ - const ONLINE_PAYMENT = 'ONLINEPAYMENT'; + public const ONLINE_PAYMENT = 'ONLINEPAYMENT'; /* * Payment received by Direct Debit (GoCardless). */ - const DD_PAYMENT = 'DDPAYMENT'; + public const DD_PAYMENT = 'DDPAYMENT'; /* * Payment received by Bank Transfer (direct). */ - const BANK_PAYMENT = 'BANKPAYMENT'; + public const BANK_PAYMENT = 'BANKPAYMENT'; /** * String representation of types for display. */ - const TYPE_STRINGS = [ + public const TYPE_STRINGS = [ self::VEND => 'Vend', self::MANUAL => 'Manual', self::TOOL => 'Tool', diff --git a/app/HMS/Entities/Snackspace/VendingMachineConnectionType.php b/app/HMS/Entities/Snackspace/VendingMachineConnectionType.php index 000abd4f7..842d697a6 100644 --- a/app/HMS/Entities/Snackspace/VendingMachineConnectionType.php +++ b/app/HMS/Entities/Snackspace/VendingMachineConnectionType.php @@ -7,17 +7,17 @@ abstract class VendingMachineConnectionType /** * A vending machine. */ - const UDP = 'UDP'; + public const UDP = 'UDP'; /** * A cash acceptor. */ - const MQTT = 'MQTT'; + public const MQTT = 'MQTT'; /** * String representation of machine connection type for display. */ - const CONNECTION_STRINGS = + public const CONNECTION_STRINGS = [ self::UDP => 'UDP', self::MQTT => 'MQTT', diff --git a/app/HMS/Entities/Snackspace/VendingMachineType.php b/app/HMS/Entities/Snackspace/VendingMachineType.php index 9b43fb48d..89d91766d 100644 --- a/app/HMS/Entities/Snackspace/VendingMachineType.php +++ b/app/HMS/Entities/Snackspace/VendingMachineType.php @@ -7,17 +7,17 @@ abstract class VendingMachineType /** * A vending machine. */ - const VEND = 'VEND'; + public const VEND = 'VEND'; /** * A cash acceptor. */ - const NOTE = 'NOTE'; + public const NOTE = 'NOTE'; /** * String representation of machine types for display. */ - const TYPE_STRINGS = + public const TYPE_STRINGS = [ self::VEND => 'Vending Machine', self::NOTE => 'Cash Acceptor', diff --git a/app/HMS/Entities/Tools/BookingType.php b/app/HMS/Entities/Tools/BookingType.php index c7747aa0d..0afb630fe 100644 --- a/app/HMS/Entities/Tools/BookingType.php +++ b/app/HMS/Entities/Tools/BookingType.php @@ -7,22 +7,22 @@ abstract class BookingType /** * Regular booking. */ - const NORMAL = 'NORMAL'; + public const NORMAL = 'NORMAL'; /** * Tool is booked for an Induction. */ - const INDUCTION = 'INDUCTION'; + public const INDUCTION = 'INDUCTION'; /** * Tool is booked for maintenance. */ - const MAINTENANCE = 'MAINTENANCE'; + public const MAINTENANCE = 'MAINTENANCE'; /** * String representation of types for display. */ - const TYPE_STRINGS = + public const TYPE_STRINGS = [ self::NORMAL => 'Normal', self::INDUCTION => 'Induction', diff --git a/app/HMS/Entities/Tools/ToolRestriction.php b/app/HMS/Entities/Tools/ToolRestriction.php index 2b8b9351c..07bde1155 100644 --- a/app/HMS/Entities/Tools/ToolRestriction.php +++ b/app/HMS/Entities/Tools/ToolRestriction.php @@ -7,10 +7,10 @@ abstract class ToolRestriction /** * Tool can be freely used by any member. */ - const UNRESTRICTED = 'UNRESTRICTED'; + public const UNRESTRICTED = 'UNRESTRICTED'; /** * Tool requires an induction before use. */ - const RESTRICTED = 'RESTRICTED'; + public const RESTRICTED = 'RESTRICTED'; } diff --git a/app/HMS/Entities/Tools/ToolState.php b/app/HMS/Entities/Tools/ToolState.php index 9b5def6a2..2b7486065 100644 --- a/app/HMS/Entities/Tools/ToolState.php +++ b/app/HMS/Entities/Tools/ToolState.php @@ -7,22 +7,22 @@ abstract class ToolState /** * Tool is in use. */ - const IN_USE = 'IN_USE'; + public const IN_USE = 'IN_USE'; /** * Tool is free to use. */ - const FREE = 'FREE'; + public const FREE = 'FREE'; /** * Tool has been disabled for maintenance. */ - const DISABLED = 'DISABLED'; + public const DISABLED = 'DISABLED'; /** * String representation of states for display. */ - const STATE_STRINGS = + public const STATE_STRINGS = [ self::IN_USE => 'In Use', self::FREE => 'Free', diff --git a/app/HMS/Entities/Tools/UsageState.php b/app/HMS/Entities/Tools/UsageState.php index bc3e72b6d..c02aa23eb 100644 --- a/app/HMS/Entities/Tools/UsageState.php +++ b/app/HMS/Entities/Tools/UsageState.php @@ -4,16 +4,14 @@ abstract class UsageState { - const IN_PROGRESS = 'IN_PROGRESS'; - - const COMPLETE = 'COMPLETE'; - - const CHARGED = 'CHARGED'; + public const IN_PROGRESS = 'IN_PROGRESS'; + public const COMPLETE = 'COMPLETE'; + public const CHARGED = 'CHARGED'; /** * String representation of states for display. */ - const STATE_STRINGS = + public const STATE_STRINGS = [ self::IN_PROGRESS => 'In Progress', self::COMPLETE => 'Complete', diff --git a/app/HMS/Entities/User.php b/app/HMS/Entities/User.php index a0c3c46ce..646ff45fd 100644 --- a/app/HMS/Entities/User.php +++ b/app/HMS/Entities/User.php @@ -41,7 +41,10 @@ class User implements HasApiTokens, DoctrineMustVerifyEmail; - const MIN_PASSWORD_LENGTH = 8; + /** + * Min Password length. + */ + public const MIN_PASSWORD_LENGTH = 8; /** * @var int diff --git a/app/HMS/Governance/VotingManager.php b/app/HMS/Governance/VotingManager.php index b1645e208..509581981 100644 --- a/app/HMS/Governance/VotingManager.php +++ b/app/HMS/Governance/VotingManager.php @@ -14,9 +14,9 @@ class VotingManager { - const VOTING_MEMBER = 'Voting Member'; - const NONVOTING_MEMBER = 'Non-voting Member'; - const CANNOT_VOTE = 'Cannot vote'; + public const VOTING_MEMBER = 'Voting Member'; + public const NONVOTING_MEMBER = 'Non-voting Member'; + public const CANNOT_VOTE = 'Cannot vote'; /** * @var RoleRepository @@ -187,7 +187,8 @@ public function getVotingStatusForUser(User $user) $sixMonthsAgo = Carbon::now()->subMonthsNoOverflow(6); // Has stated a preference for VOTING - if ($user->getProfile()->getVotingPreference() == VotingPreference::VOTING && $user->getProfile()->getVotingPreferenceStatedAt()->isAfter($sixMonthsAgo)) { + if ($user->getProfile()->getVotingPreference() == VotingPreference::VOTING + && $user->getProfile()->getVotingPreferenceStatedAt()->isAfter($sixMonthsAgo)) { return self::VOTING_MEMBER . ', Stated'; } @@ -211,7 +212,8 @@ public function getVotingStatusForUser(User $user) } // Has stated a preference for NONVOTING - if ($user->getProfile()->getVotingPreference() == VotingPreference::NONVOTING && $user->getProfile()->getVotingPreferenceStatedAt()->isAfter($sixMonthsAgo)) { + if ($user->getProfile()->getVotingPreference() == VotingPreference::NONVOTING + && $user->getProfile()->getVotingPreferenceStatedAt()->isAfter($sixMonthsAgo)) { return self::NONVOTING_MEMBER . ', Stated'; } diff --git a/app/HMS/Governance/VotingPreference.php b/app/HMS/Governance/VotingPreference.php index d6d328744..655419f86 100644 --- a/app/HMS/Governance/VotingPreference.php +++ b/app/HMS/Governance/VotingPreference.php @@ -7,22 +7,22 @@ class VotingPreference /** * Member has not yet stated a voting preference. */ - const AUTOMATIC = 'AUTOMATIC'; + public const AUTOMATIC = 'AUTOMATIC'; /** * Member has stated a preference as Voting. */ - const VOTING = 'VOTING'; + public const VOTING = 'VOTING'; /** * Member has stated a preference as NonVoting. */ - const NONVOTING = 'NONVOTING'; + public const NONVOTING = 'NONVOTING'; /** * String representation of states for display. */ - const STATE_STRINGS = + public const STATE_STRINGS = [ self::AUTOMATIC => 'Automatic', self::VOTING => 'Voting', diff --git a/app/HMS/Tools/ToolManager.php b/app/HMS/Tools/ToolManager.php index a0961d78e..b7187125d 100644 --- a/app/HMS/Tools/ToolManager.php +++ b/app/HMS/Tools/ToolManager.php @@ -14,17 +14,23 @@ class ToolManager { - const MAINTAINER = 'MAINTAINER'; - const INDUCTOR = 'INDUCTOR'; - const USER = 'USER'; + public const MAINTAINER = 'MAINTAINER'; + public const INDUCTOR = 'INDUCTOR'; + public const USER = 'USER'; - const GRANT_STRINGS = [ + /* + * String representations of grants for display. + */ + public const GRANT_STRINGS = [ self::MAINTAINER => 'Maintainer', self::INDUCTOR => 'Inductor', self::USER => 'User', ]; - const PERMISSION_NAME_TEMPLATES = [ + /* + * Permission templates. + */ + public const PERMISSION_NAME_TEMPLATES = [ 'tools._TOOL_PERMISSION_NAME_.use', // can turn on the machin_e 'tools._TOOL_PERMISSION_NAME_.book', // can make a tool booking 'tools._TOOL_PERMISSION_NAME_.induct', // can induct a member on a tool @@ -35,7 +41,10 @@ class ToolManager 'tools.search.users', // assigend to tool sepcfic mainter roles, allows search for grant ]; - const ROLE_TEMPLATES = [ + /* + * Role templates. + */ + public const ROLE_TEMPLATES = [ 'tools._TOOL_PERMISSION_NAME_.user' => [ 'name' => 'Tool: _TOOL_NAME_ User', 'description' => 'Can make bookings and use the tool', diff --git a/app/Http/Controllers/Banking/BankTransactionController.php b/app/Http/Controllers/Banking/BankTransactionController.php index 6b4b79e68..4343eb1ca 100644 --- a/app/Http/Controllers/Banking/BankTransactionController.php +++ b/app/Http/Controllers/Banking/BankTransactionController.php @@ -29,6 +29,7 @@ class BankTransactionController extends Controller * @var BankTransactionRepository */ protected $bankTransactionRepository; + /** * @var UserRepository */ diff --git a/app/Http/Controllers/Instrumentation/ElectricController.php b/app/Http/Controllers/Instrumentation/ElectricController.php index 99a2a59bb..908a85186 100644 --- a/app/Http/Controllers/Instrumentation/ElectricController.php +++ b/app/Http/Controllers/Instrumentation/ElectricController.php @@ -12,6 +12,7 @@ class ElectricController extends Controller { protected $electricMeterRepository; + protected $electricReadingRepository; public function __construct( diff --git a/app/Listeners/Membership/ReinstateMembership.php b/app/Listeners/Membership/ReinstateMembership.php index ee599912e..067cdae7c 100644 --- a/app/Listeners/Membership/ReinstateMembership.php +++ b/app/Listeners/Membership/ReinstateMembership.php @@ -23,7 +23,9 @@ class ReinstateMembership implements ShouldQueue * @var RoleManager */ protected $roleManager; + protected $metaRepository; + protected $roleRepository; /** diff --git a/app/Listeners/Membership/RevokeMembership.php b/app/Listeners/Membership/RevokeMembership.php index 379a60eb0..22205116c 100644 --- a/app/Listeners/Membership/RevokeMembership.php +++ b/app/Listeners/Membership/RevokeMembership.php @@ -39,6 +39,10 @@ class RevokeMembership implements ShouldQueue * @var BankRepository */ protected $bankRepository; + + /** + * @var BoxRepository + */ protected $boxRepository; /** diff --git a/app/Mail/ToCurrentMembers.php b/app/Mail/ToCurrentMembers.php index 7163da2c8..d8c21060c 100644 --- a/app/Mail/ToCurrentMembers.php +++ b/app/Mail/ToCurrentMembers.php @@ -79,7 +79,8 @@ public function renderText() Container::getInstance()->call([$this, 'build']); return Container::getInstance()->make('mailer')->render( - 'emails.emailMembers.toCurrentMembers_plain', $this->buildViewData() + 'emails.emailMembers.toCurrentMembers_plain', + $this->buildViewData() ); } } diff --git a/database/migrations_doctrine/Version20161024103642_create_initial_user_permission_and_role_tables.php b/database/migrations_doctrine/Version20161024103642_create_initial_user_permission_and_role_tables.php index f256843e9..964dd804a 100644 --- a/database/migrations_doctrine/Version20161024103642_create_initial_user_permission_and_role_tables.php +++ b/database/migrations_doctrine/Version20161024103642_create_initial_user_permission_and_role_tables.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161024103642_create_initial_user_permission_and_role_tables extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161024121537_create_profile_table.php b/database/migrations_doctrine/Version20161024121537_create_profile_table.php index efa981f76..e2be3b57f 100644 --- a/database/migrations_doctrine/Version20161024121537_create_profile_table.php +++ b/database/migrations_doctrine/Version20161024121537_create_profile_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161024121537_create_profile_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161024164731_add_soft_delete_to_user.php b/database/migrations_doctrine/Version20161024164731_add_soft_delete_to_user.php index 8a75e9e84..da79565ca 100644 --- a/database/migrations_doctrine/Version20161024164731_add_soft_delete_to_user.php +++ b/database/migrations_doctrine/Version20161024164731_add_soft_delete_to_user.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161024164731_add_soft_delete_to_user extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161025122151_add_timestampable_to_user.php b/database/migrations_doctrine/Version20161025122151_add_timestampable_to_user.php index fcfa0273e..a422edfc9 100644 --- a/database/migrations_doctrine/Version20161025122151_add_timestampable_to_user.php +++ b/database/migrations_doctrine/Version20161025122151_add_timestampable_to_user.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161025122151_add_timestampable_to_user extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161105204023_add_additional_role_fields.php b/database/migrations_doctrine/Version20161105204023_add_additional_role_fields.php index 67e74c37c..350fb4333 100644 --- a/database/migrations_doctrine/Version20161105204023_add_additional_role_fields.php +++ b/database/migrations_doctrine/Version20161105204023_add_additional_role_fields.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161105204023_add_additional_role_fields extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161107022054_add_invite.php b/database/migrations_doctrine/Version20161107022054_add_invite.php index af3b8430a..5c0e75811 100644 --- a/database/migrations_doctrine/Version20161107022054_add_invite.php +++ b/database/migrations_doctrine/Version20161107022054_add_invite.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161107022054_add_invite extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161127170148_add_basic_profile_fields_to_the_profile.php b/database/migrations_doctrine/Version20161127170148_add_basic_profile_fields_to_the_profile.php index 162eebcd7..0bb7c533b 100644 --- a/database/migrations_doctrine/Version20161127170148_add_basic_profile_fields_to_the_profile.php +++ b/database/migrations_doctrine/Version20161127170148_add_basic_profile_fields_to_the_profile.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161127170148_add_basic_profile_fields_to_the_profile extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161220211524_add_label_template.php b/database/migrations_doctrine/Version20161220211524_add_label_template.php index e4bdf97d0..6a0eba6b3 100644 --- a/database/migrations_doctrine/Version20161220211524_add_label_template.php +++ b/database/migrations_doctrine/Version20161220211524_add_label_template.php @@ -3,8 +3,8 @@ namespace Database\Migrations; use Carbon\Carbon; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161220211524_add_label_template extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161220223143_split_name.php b/database/migrations_doctrine/Version20161220223143_split_name.php index 9cc8b38e0..5881f086e 100644 --- a/database/migrations_doctrine/Version20161220223143_split_name.php +++ b/database/migrations_doctrine/Version20161220223143_split_name.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161220223143_split_name extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161222000655_add_meta.php b/database/migrations_doctrine/Version20161222000655_add_meta.php index 3fe5c17be..e67a2864f 100644 --- a/database/migrations_doctrine/Version20161222000655_add_meta.php +++ b/database/migrations_doctrine/Version20161222000655_add_meta.php @@ -3,8 +3,8 @@ namespace Database\Migrations; use Carbon\Carbon; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161222000655_add_meta extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20161228153252_add_links.php b/database/migrations_doctrine/Version20161228153252_add_links.php index 8555fa4be..367df3542 100644 --- a/database/migrations_doctrine/Version20161228153252_add_links.php +++ b/database/migrations_doctrine/Version20161228153252_add_links.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20161228153252_add_links extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170103013450_add_vimbadmin_tokens.php b/database/migrations_doctrine/Version20170103013450_add_vimbadmin_tokens.php index 5934d3bd0..cac944508 100644 --- a/database/migrations_doctrine/Version20170103013450_add_vimbadmin_tokens.php +++ b/database/migrations_doctrine/Version20170103013450_add_vimbadmin_tokens.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170103013450_add_vimbadmin_tokens extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170205171526_add_guest_wifi_to_meta.php b/database/migrations_doctrine/Version20170205171526_add_guest_wifi_to_meta.php index 58e44d30b..773dcc436 100644 --- a/database/migrations_doctrine/Version20170205171526_add_guest_wifi_to_meta.php +++ b/database/migrations_doctrine/Version20170205171526_add_guest_wifi_to_meta.php @@ -3,8 +3,8 @@ namespace Database\Migrations; use Carbon\Carbon; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170205171526_add_guest_wifi_to_meta extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170206225300_fix_invite_index.php b/database/migrations_doctrine/Version20170206225300_fix_invite_index.php index 12fe9db65..b58ddad5d 100644 --- a/database/migrations_doctrine/Version20170206225300_fix_invite_index.php +++ b/database/migrations_doctrine/Version20170206225300_fix_invite_index.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170206225300_fix_invite_index extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170209091949_populate_starter_links.php b/database/migrations_doctrine/Version20170209091949_populate_starter_links.php index ec028d53c..d5618f548 100644 --- a/database/migrations_doctrine/Version20170209091949_populate_starter_links.php +++ b/database/migrations_doctrine/Version20170209091949_populate_starter_links.php @@ -3,8 +3,8 @@ namespace Database\Migrations; use Carbon\Carbon; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170209091949_populate_starter_links extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170226152209_add_profile_dob_field.php b/database/migrations_doctrine/Version20170226152209_add_profile_dob_field.php index e37c98c03..4aa78719e 100644 --- a/database/migrations_doctrine/Version20170226152209_add_profile_dob_field.php +++ b/database/migrations_doctrine/Version20170226152209_add_profile_dob_field.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170226152209_add_profile_dob_field extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170423104651_add_email_slack_retained_to_role.php b/database/migrations_doctrine/Version20170423104651_add_email_slack_retained_to_role.php index 02f40c90e..a448549e8 100644 --- a/database/migrations_doctrine/Version20170423104651_add_email_slack_retained_to_role.php +++ b/database/migrations_doctrine/Version20170423104651_add_email_slack_retained_to_role.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170423104651_add_email_slack_retained_to_role extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170426184421_add_account_table.php b/database/migrations_doctrine/Version20170426184421_add_account_table.php index 9e52aeb14..ca86b9cc1 100644 --- a/database/migrations_doctrine/Version20170426184421_add_account_table.php +++ b/database/migrations_doctrine/Version20170426184421_add_account_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170426184421_add_account_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170502204811_add_user_account_relation.php b/database/migrations_doctrine/Version20170502204811_add_user_account_relation.php index 3acaf6c7c..3470e8b45 100644 --- a/database/migrations_doctrine/Version20170502204811_add_user_account_relation.php +++ b/database/migrations_doctrine/Version20170502204811_add_user_account_relation.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170502204811_add_user_account_relation extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170512090722_add_role_update_table.php b/database/migrations_doctrine/Version20170512090722_add_role_update_table.php index a3d442a57..e9f1dd0d6 100644 --- a/database/migrations_doctrine/Version20170512090722_add_role_update_table.php +++ b/database/migrations_doctrine/Version20170512090722_add_role_update_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170512090722_add_role_update_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170512233938_add_emails_table.php b/database/migrations_doctrine/Version20170512233938_add_emails_table.php index ac657d8b4..4d1d6ae9b 100644 --- a/database/migrations_doctrine/Version20170512233938_add_emails_table.php +++ b/database/migrations_doctrine/Version20170512233938_add_emails_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170512233938_add_emails_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170531071852_add_pin_table.php b/database/migrations_doctrine/Version20170531071852_add_pin_table.php index 6f9cf7535..6114fb259 100644 --- a/database/migrations_doctrine/Version20170531071852_add_pin_table.php +++ b/database/migrations_doctrine/Version20170531071852_add_pin_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170531071852_add_pin_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170531080558_add_rfid_tags_table.php b/database/migrations_doctrine/Version20170531080558_add_rfid_tags_table.php index a9641625e..40719bdd2 100644 --- a/database/migrations_doctrine/Version20170531080558_add_rfid_tags_table.php +++ b/database/migrations_doctrine/Version20170531080558_add_rfid_tags_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170531080558_add_rfid_tags_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170711080528_add_zone_table.php b/database/migrations_doctrine/Version20170711080528_add_zone_table.php index 1d9752cb1..e3781aff9 100644 --- a/database/migrations_doctrine/Version20170711080528_add_zone_table.php +++ b/database/migrations_doctrine/Version20170711080528_add_zone_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170711080528_add_zone_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170711080609_add_door_table.php b/database/migrations_doctrine/Version20170711080609_add_door_table.php index 1768ad48c..21d58755b 100644 --- a/database/migrations_doctrine/Version20170711080609_add_door_table.php +++ b/database/migrations_doctrine/Version20170711080609_add_door_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170711080609_add_door_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170711080613_add_access_log_table.php b/database/migrations_doctrine/Version20170711080613_add_access_log_table.php index 8f102693b..65f8e0de5 100644 --- a/database/migrations_doctrine/Version20170711080613_add_access_log_table.php +++ b/database/migrations_doctrine/Version20170711080613_add_access_log_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170711080613_add_access_log_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170711081028_populate_zones.php b/database/migrations_doctrine/Version20170711081028_populate_zones.php index 763f33f1c..e090b7cca 100644 --- a/database/migrations_doctrine/Version20170711081028_populate_zones.php +++ b/database/migrations_doctrine/Version20170711081028_populate_zones.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170711081028_populate_zones extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170711081031_populate_doors.php b/database/migrations_doctrine/Version20170711081031_populate_doors.php index c8c063779..abffef4c6 100644 --- a/database/migrations_doctrine/Version20170711081031_populate_doors.php +++ b/database/migrations_doctrine/Version20170711081031_populate_doors.php @@ -3,8 +3,8 @@ namespace Database\Migrations; use Carbon\Carbon; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170711081031_populate_doors extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170802184329_add_banks_table.php b/database/migrations_doctrine/Version20170802184329_add_banks_table.php index c9e47c7ac..1ae9b5de2 100644 --- a/database/migrations_doctrine/Version20170802184329_add_banks_table.php +++ b/database/migrations_doctrine/Version20170802184329_add_banks_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170802184329_add_banks_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170802184534_populate_banks.php b/database/migrations_doctrine/Version20170802184534_populate_banks.php index 23d478076..be72c16c3 100644 --- a/database/migrations_doctrine/Version20170802184534_populate_banks.php +++ b/database/migrations_doctrine/Version20170802184534_populate_banks.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170802184534_populate_banks extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170802191716_add_bank_transaction_table.php b/database/migrations_doctrine/Version20170802191716_add_bank_transaction_table.php index 47c156923..36c44daed 100644 --- a/database/migrations_doctrine/Version20170802191716_add_bank_transaction_table.php +++ b/database/migrations_doctrine/Version20170802191716_add_bank_transaction_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170802191716_add_bank_transaction_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170804133343_add_membership_status_notifications_table.php b/database/migrations_doctrine/Version20170804133343_add_membership_status_notifications_table.php index 10395d40d..df546e4b0 100644 --- a/database/migrations_doctrine/Version20170804133343_add_membership_status_notifications_table.php +++ b/database/migrations_doctrine/Version20170804133343_add_membership_status_notifications_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170804133343_add_membership_status_notifications_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170826061914_add_member_projects_table.php b/database/migrations_doctrine/Version20170826061914_add_member_projects_table.php index 747ebae32..89d33aef6 100644 --- a/database/migrations_doctrine/Version20170826061914_add_member_projects_table.php +++ b/database/migrations_doctrine/Version20170826061914_add_member_projects_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170826061914_add_member_projects_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170826192006_add_fullstring_to_emails.php b/database/migrations_doctrine/Version20170826192006_add_fullstring_to_emails.php index 50f39e69a..c565087de 100644 --- a/database/migrations_doctrine/Version20170826192006_add_fullstring_to_emails.php +++ b/database/migrations_doctrine/Version20170826192006_add_fullstring_to_emails.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170826192006_add_fullstring_to_emails extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170826195241_add_balance_to_profile.php b/database/migrations_doctrine/Version20170826195241_add_balance_to_profile.php index 10ca42c0e..619ecaa69 100644 --- a/database/migrations_doctrine/Version20170826195241_add_balance_to_profile.php +++ b/database/migrations_doctrine/Version20170826195241_add_balance_to_profile.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170826195241_add_balance_to_profile extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170826201517_add_products_table.php b/database/migrations_doctrine/Version20170826201517_add_products_table.php index 9fde14334..60fe7833b 100644 --- a/database/migrations_doctrine/Version20170826201517_add_products_table.php +++ b/database/migrations_doctrine/Version20170826201517_add_products_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170826201517_add_products_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170826202631_add_transactions_table.php b/database/migrations_doctrine/Version20170826202631_add_transactions_table.php index 0370c9ac3..324698b70 100644 --- a/database/migrations_doctrine/Version20170826202631_add_transactions_table.php +++ b/database/migrations_doctrine/Version20170826202631_add_transactions_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170826202631_add_transactions_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170830200741_add_blacklist_usernames_table.php b/database/migrations_doctrine/Version20170830200741_add_blacklist_usernames_table.php index b281527ad..828565d79 100644 --- a/database/migrations_doctrine/Version20170830200741_add_blacklist_usernames_table.php +++ b/database/migrations_doctrine/Version20170830200741_add_blacklist_usernames_table.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170830200741_add_blacklist_usernames_table extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20170830200924_populate_blacklist.php b/database/migrations_doctrine/Version20170830200924_populate_blacklist.php index 58d500eb1..d1d81cc31 100644 --- a/database/migrations_doctrine/Version20170830200924_populate_blacklist.php +++ b/database/migrations_doctrine/Version20170830200924_populate_blacklist.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20170830200924_populate_blacklist extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20171126163149_bank_transactions_duplicate_idx.php b/database/migrations_doctrine/Version20171126163149_bank_transactions_duplicate_idx.php index def3de265..e3fafdc1b 100644 --- a/database/migrations_doctrine/Version20171126163149_bank_transactions_duplicate_idx.php +++ b/database/migrations_doctrine/Version20171126163149_bank_transactions_duplicate_idx.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20171126163149_bank_transactions_duplicate_idx extends AbstractMigration { diff --git a/database/migrations_doctrine/Version20171126220932_add_member_boxes.php b/database/migrations_doctrine/Version20171126220932_add_member_boxes.php index 87f7fe5d7..8b11d7c0c 100644 --- a/database/migrations_doctrine/Version20171126220932_add_member_boxes.php +++ b/database/migrations_doctrine/Version20171126220932_add_member_boxes.php @@ -2,8 +2,8 @@ namespace Database\Migrations; -use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema as Schema; +use Doctrine\Migrations\AbstractMigration; class Version20171126220932_add_member_boxes extends AbstractMigration { diff --git a/database/seeds/AccountTableSeeder.php b/database/seeds/AccountTableSeeder.php index dd7239a51..e1d73109a 100644 --- a/database/seeds/AccountTableSeeder.php +++ b/database/seeds/AccountTableSeeder.php @@ -29,6 +29,7 @@ class AccountTableSeeder extends Seeder * @var AccountRepository */ protected $accountRepository; + protected $entityManager; /** diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index 547152f6a..ab9240255 100644 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -13,7 +13,7 @@ trait CreatesApplication */ public function createApplication() { - $app = require __DIR__.'/../bootstrap/app.php'; + $app = require __DIR__ . '/../bootstrap/app.php'; $app->make(Kernel::class)->bootstrap(); diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index f31e495ca..8fbf37067 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -3,7 +3,6 @@ namespace Tests\Feature; use Tests\TestCase; -use Illuminate\Foundation\Testing\RefreshDatabase; class ExampleTest extends TestCase { diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php index e9fe19c66..06ece2c2c 100644 --- a/tests/Unit/ExampleTest.php +++ b/tests/Unit/ExampleTest.php @@ -3,7 +3,6 @@ namespace Tests\Unit; use Tests\TestCase; -use Illuminate\Foundation\Testing\RefreshDatabase; class ExampleTest extends TestCase { diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 5041c5a6b..2abd4f3fd 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -2,7 +2,7 @@ use Illuminate\Contracts\Console\Kernel; -require_once __DIR__.'/../vendor/autoload.php'; +require_once __DIR__ . '/../vendor/autoload.php'; /* |-------------------------------------------------------------------------- @@ -20,7 +20,7 @@ 'event:cache', ]; -$app = require __DIR__.'/../bootstrap/app.php'; +$app = require __DIR__ . '/../bootstrap/app.php'; $console = tap($app->make(Kernel::class))->bootstrap();