From 1031826a3d242735da26c9e5342fda2a91195db1 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 29 Nov 2016 05:03:53 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- migrations/2015_02_24_000000_create_access_tokens_table.php | 1 + migrations/2015_02_24_000000_create_api_keys_table.php | 1 + migrations/2015_02_24_000000_create_config_table.php | 1 + migrations/2015_02_24_000000_create_discussions_table.php | 1 + migrations/2015_02_24_000000_create_email_tokens_table.php | 1 + migrations/2015_02_24_000000_create_groups_table.php | 1 + migrations/2015_02_24_000000_create_notifications_table.php | 1 + migrations/2015_02_24_000000_create_password_tokens_table.php | 1 + migrations/2015_02_24_000000_create_permissions_table.php | 1 + migrations/2015_02_24_000000_create_posts_table.php | 1 + migrations/2015_02_24_000000_create_users_discussions_table.php | 1 + migrations/2015_02_24_000000_create_users_groups_table.php | 1 + migrations/2015_02_24_000000_create_users_table.php | 1 + migrations/2015_09_15_000000_create_auth_tokens_table.php | 1 + migrations/2015_09_20_224327_add_hide_to_discussions.php | 1 + migrations/2015_09_22_030432_rename_notification_read_time.php | 1 + migrations/2015_10_07_130531_rename_config_to_settings.php | 1 + migrations/2015_10_24_194000_add_ip_address_to_posts.php | 1 + migrations/2015_12_05_042721_change_access_tokens_columns.php | 1 + .../2015_12_17_194247_change_settings_value_column_to_text.php | 1 + migrations/2016_02_04_095452_add_slug_to_discussions.php | 1 + src/Admin/AdminServiceProvider.php | 1 + src/Admin/Controller/WebAppController.php | 1 + src/Admin/Middleware/RequireAdministrateAbility.php | 1 + src/Admin/UrlGenerator.php | 1 + src/Admin/WebApp.php | 1 + src/Api/ApiKey.php | 1 + src/Api/ApiServiceProvider.php | 1 + src/Api/Client.php | 1 + src/Api/Controller/AbstractCollectionController.php | 1 + src/Api/Controller/AbstractCreateController.php | 1 + src/Api/Controller/AbstractDeleteController.php | 1 + src/Api/Controller/AbstractResourceController.php | 1 + src/Api/Controller/AbstractSerializeController.php | 1 + src/Api/Controller/CreateDiscussionController.php | 1 + src/Api/Controller/CreateGroupController.php | 1 + src/Api/Controller/CreatePostController.php | 1 + src/Api/Controller/CreateUserController.php | 1 + src/Api/Controller/DeleteAvatarController.php | 1 + src/Api/Controller/DeleteDiscussionController.php | 1 + src/Api/Controller/DeleteFaviconController.php | 1 + src/Api/Controller/DeleteGroupController.php | 1 + src/Api/Controller/DeleteLogoController.php | 1 + src/Api/Controller/DeletePostController.php | 1 + src/Api/Controller/DeleteUserController.php | 1 + src/Api/Controller/ForgotPasswordController.php | 1 + src/Api/Controller/ListDiscussionsController.php | 1 + src/Api/Controller/ListGroupsController.php | 1 + src/Api/Controller/ListNotificationsController.php | 1 + src/Api/Controller/ListPostsController.php | 1 + src/Api/Controller/ListUsersController.php | 1 + src/Api/Controller/ReadAllNotificationsController.php | 1 + src/Api/Controller/SendConfirmationEmailController.php | 1 + src/Api/Controller/SetPermissionController.php | 1 + src/Api/Controller/SetSettingsController.php | 1 + src/Api/Controller/ShowDiscussionController.php | 1 + src/Api/Controller/ShowForumController.php | 1 + src/Api/Controller/ShowPostController.php | 1 + src/Api/Controller/ShowUserController.php | 1 + src/Api/Controller/TokenController.php | 1 + src/Api/Controller/UninstallExtensionController.php | 1 + src/Api/Controller/UpdateDiscussionController.php | 1 + src/Api/Controller/UpdateExtensionController.php | 1 + src/Api/Controller/UpdateGroupController.php | 1 + src/Api/Controller/UpdateNotificationController.php | 1 + src/Api/Controller/UpdatePostController.php | 1 + src/Api/Controller/UpdateUserController.php | 1 + src/Api/Controller/UploadAvatarController.php | 1 + src/Api/Controller/UploadFaviconController.php | 1 + src/Api/Controller/UploadLogoController.php | 1 + src/Api/ErrorHandler.php | 1 + src/Api/Exception/InvalidAccessTokenException.php | 1 + src/Api/Handler/FloodingExceptionHandler.php | 1 + src/Api/Handler/IlluminateValidationExceptionHandler.php | 1 + src/Api/Handler/InvalidAccessTokenExceptionHandler.php | 1 + src/Api/Handler/InvalidConfirmationTokenExceptionHandler.php | 1 + src/Api/Handler/MethodNotAllowedExceptionHandler.php | 1 + src/Api/Handler/ModelNotFoundExceptionHandler.php | 1 + src/Api/Handler/PermissionDeniedExceptionHandler.php | 1 + src/Api/Handler/RouteNotFoundExceptionHandler.php | 1 + src/Api/Handler/TokenMismatchExceptionHandler.php | 1 + src/Api/Handler/ValidationExceptionHandler.php | 1 + src/Api/JsonApiResponse.php | 1 + src/Api/Middleware/FakeHttpMethods.php | 1 + src/Api/Middleware/HandleErrors.php | 1 + src/Api/Serializer/AbstractSerializer.php | 1 + src/Api/Serializer/CurrentUserSerializer.php | 1 + src/Api/Serializer/DiscussionBasicSerializer.php | 1 + src/Api/Serializer/DiscussionSerializer.php | 1 + src/Api/Serializer/ForumSerializer.php | 1 + src/Api/Serializer/GroupSerializer.php | 1 + src/Api/Serializer/NotificationSerializer.php | 1 + src/Api/Serializer/PostBasicSerializer.php | 1 + src/Api/Serializer/PostSerializer.php | 1 + src/Api/Serializer/UserBasicSerializer.php | 1 + src/Api/Serializer/UserSerializer.php | 1 + src/Api/UrlGenerator.php | 1 + src/Asset/CompilerInterface.php | 1 + src/Asset/JsCompiler.php | 1 + src/Asset/LessCompiler.php | 1 + src/Asset/RevisionCompiler.php | 1 + src/Console/Command/AbstractCommand.php | 1 + src/Console/Command/GenerateMigrationCommand.php | 1 + src/Core/Access/AbstractPolicy.php | 1 + src/Core/Access/AssertPermissionTrait.php | 1 + src/Core/Access/DiscussionPolicy.php | 1 + src/Core/Access/GroupPolicy.php | 1 + src/Core/Access/PostPolicy.php | 1 + src/Core/Access/UserPolicy.php | 1 + src/Core/AuthToken.php | 1 + src/Core/Command/ConfirmEmail.php | 1 + src/Core/Command/ConfirmEmailHandler.php | 1 + src/Core/Command/CreateGroup.php | 1 + src/Core/Command/CreateGroupHandler.php | 1 + src/Core/Command/DeleteAvatar.php | 1 + src/Core/Command/DeleteAvatarHandler.php | 1 + src/Core/Command/DeleteDiscussion.php | 1 + src/Core/Command/DeleteDiscussionHandler.php | 1 + src/Core/Command/DeleteGroup.php | 1 + src/Core/Command/DeleteGroupHandler.php | 1 + src/Core/Command/DeletePost.php | 1 + src/Core/Command/DeletePostHandler.php | 1 + src/Core/Command/DeleteUser.php | 1 + src/Core/Command/DeleteUserHandler.php | 1 + src/Core/Command/EditDiscussion.php | 1 + src/Core/Command/EditDiscussionHandler.php | 1 + src/Core/Command/EditGroup.php | 1 + src/Core/Command/EditGroupHandler.php | 1 + src/Core/Command/EditPost.php | 1 + src/Core/Command/EditPostHandler.php | 1 + src/Core/Command/EditUser.php | 1 + src/Core/Command/EditUserHandler.php | 1 + src/Core/Command/PostReply.php | 1 + src/Core/Command/PostReplyHandler.php | 1 + src/Core/Command/ReadAllNotifications.php | 1 + src/Core/Command/ReadAllNotificationsHandler.php | 1 + src/Core/Command/ReadDiscussion.php | 1 + src/Core/Command/ReadDiscussionHandler.php | 1 + src/Core/Command/ReadNotification.php | 1 + src/Core/Command/ReadNotificationHandler.php | 1 + src/Core/Command/RegisterUser.php | 1 + src/Core/Command/RegisterUserHandler.php | 1 + src/Core/Command/RequestPasswordReset.php | 1 + src/Core/Command/RequestPasswordResetHandler.php | 1 + src/Core/Command/StartDiscussion.php | 1 + src/Core/Command/StartDiscussionHandler.php | 1 + src/Core/Command/UploadAvatar.php | 1 + src/Core/Command/UploadAvatarHandler.php | 1 + src/Core/CoreServiceProvider.php | 1 + src/Core/Discussion.php | 1 + src/Core/DiscussionState.php | 1 + src/Core/EmailToken.php | 1 + src/Core/Exception/FloodingException.php | 1 + src/Core/Exception/InvalidConfirmationTokenException.php | 1 + src/Core/Exception/PermissionDeniedException.php | 1 + src/Core/Exception/ValidationException.php | 1 + src/Core/Group.php | 1 + src/Core/Guest.php | 1 + src/Core/Listener/DiscussionMetadataUpdater.php | 1 + src/Core/Listener/DiscussionRenamedNotifier.php | 1 + src/Core/Listener/EmailConfirmationMailer.php | 1 + src/Core/Listener/UserMetadataUpdater.php | 1 + src/Core/Notification.php | 1 + src/Core/Notification/BlueprintInterface.php | 1 + src/Core/Notification/DiscussionRenamedBlueprint.php | 1 + src/Core/Notification/MailableInterface.php | 1 + src/Core/Notification/NotificationMailer.php | 1 + src/Core/Notification/NotificationServiceProvider.php | 1 + src/Core/Notification/NotificationSyncer.php | 1 + src/Core/PasswordToken.php | 1 + src/Core/Permission.php | 1 + src/Core/Post.php | 1 + src/Core/Post/AbstractEventPost.php | 1 + src/Core/Post/CommentPost.php | 1 + src/Core/Post/DiscussionRenamedPost.php | 1 + src/Core/Post/Floodgate.php | 1 + src/Core/Post/MergeableInterface.php | 1 + src/Core/Post/RegisteredTypesScope.php | 1 + src/Core/Repository/DiscussionRepository.php | 1 + src/Core/Repository/GroupRepository.php | 1 + src/Core/Repository/NotificationRepository.php | 1 + src/Core/Repository/PostRepository.php | 1 + src/Core/Repository/UserRepository.php | 1 + src/Core/Search/AbstractRegexGambit.php | 1 + src/Core/Search/AbstractSearch.php | 1 + src/Core/Search/ApplySearchParametersTrait.php | 1 + src/Core/Search/Discussion/DiscussionSearch.php | 1 + src/Core/Search/Discussion/DiscussionSearcher.php | 1 + src/Core/Search/Discussion/Fulltext/DriverInterface.php | 1 + src/Core/Search/Discussion/Fulltext/MySqlFulltextDriver.php | 1 + src/Core/Search/Discussion/Gambit/AuthorGambit.php | 1 + src/Core/Search/Discussion/Gambit/CreatedGambit.php | 1 + src/Core/Search/Discussion/Gambit/FulltextGambit.php | 1 + src/Core/Search/Discussion/Gambit/HiddenGambit.php | 1 + src/Core/Search/Discussion/Gambit/UnreadGambit.php | 1 + src/Core/Search/GambitInterface.php | 1 + src/Core/Search/GambitManager.php | 1 + src/Core/Search/SearchCriteria.php | 1 + src/Core/Search/SearchResults.php | 1 + src/Core/Search/SearchServiceProvider.php | 1 + src/Core/Search/User/Gambit/EmailGambit.php | 1 + src/Core/Search/User/Gambit/FulltextGambit.php | 1 + src/Core/Search/User/UserSearch.php | 1 + src/Core/Search/User/UserSearcher.php | 1 + src/Core/Support/DispatchEventsTrait.php | 1 + src/Core/Support/EventGeneratorTrait.php | 1 + src/Core/Support/ScopeVisibilityTrait.php | 1 + src/Core/User.php | 1 + src/Core/Validator/AbstractValidator.php | 1 + src/Core/Validator/AvatarValidator.php | 1 + src/Core/Validator/DiscussionValidator.php | 1 + src/Core/Validator/GroupValidator.php | 1 + src/Core/Validator/PostValidator.php | 1 + src/Core/Validator/UserValidator.php | 1 + src/Database/AbstractModel.php | 1 + src/Database/DatabaseServiceProvider.php | 1 + src/Database/Migration.php | 1 + src/Database/MigrationCreator.php | 1 + src/Debug/Console/CacheClearCommand.php | 1 + src/Debug/Console/InfoCommand.php | 1 + src/Event/AbstractConfigureGambits.php | 1 + src/Event/AbstractConfigureRoutes.php | 1 + src/Event/AvatarWillBeDeleted.php | 1 + src/Event/AvatarWillBeSaved.php | 1 + src/Event/CheckUserPassword.php | 1 + src/Event/ConfigureApiController.php | 1 + src/Event/ConfigureApiRoutes.php | 1 + src/Event/ConfigureClientView.php | 1 + src/Event/ConfigureDiscussionGambits.php | 1 + src/Event/ConfigureDiscussionSearch.php | 1 + src/Event/ConfigureFormatter.php | 1 + src/Event/ConfigureFormatterParser.php | 1 + src/Event/ConfigureFormatterRenderer.php | 1 + src/Event/ConfigureForumRoutes.php | 1 + src/Event/ConfigureLocales.php | 1 + src/Event/ConfigureMiddleware.php | 1 + src/Event/ConfigureModelDates.php | 1 + src/Event/ConfigureModelDefaultAttributes.php | 1 + src/Event/ConfigureNotificationTypes.php | 1 + src/Event/ConfigurePostTypes.php | 1 + src/Event/ConfigurePostsQuery.php | 1 + src/Event/ConfigureUserGambits.php | 1 + src/Event/ConfigureUserPreferences.php | 1 + src/Event/ConfigureUserSearch.php | 1 + src/Event/ConfigureValidator.php | 1 + src/Event/ConfigureWebApp.php | 1 + src/Event/DiscussionStateWillBeSaved.php | 1 + src/Event/DiscussionWasDeleted.php | 1 + src/Event/DiscussionWasHidden.php | 1 + src/Event/DiscussionWasRead.php | 1 + src/Event/DiscussionWasRenamed.php | 1 + src/Event/DiscussionWasRestored.php | 1 + src/Event/DiscussionWasStarted.php | 1 + src/Event/DiscussionWillBeDeleted.php | 1 + src/Event/DiscussionWillBeSaved.php | 1 + src/Event/ExtensionWasDisabled.php | 1 + src/Event/ExtensionWasEnabled.php | 1 + src/Event/ExtensionWasUninstalled.php | 1 + src/Event/GetApiRelationship.php | 1 + src/Event/GetModelRelationship.php | 1 + src/Event/GetPermission.php | 1 + src/Event/GroupWasCreated.php | 1 + src/Event/GroupWasDeleted.php | 1 + src/Event/GroupWasRenamed.php | 1 + src/Event/GroupWillBeDeleted.php | 1 + src/Event/GroupWillBeSaved.php | 1 + src/Event/NotificationWillBeSent.php | 1 + src/Event/PostWasDeleted.php | 1 + src/Event/PostWasHidden.php | 1 + src/Event/PostWasPosted.php | 1 + src/Event/PostWasRestored.php | 1 + src/Event/PostWasRevised.php | 1 + src/Event/PostWillBeDeleted.php | 1 + src/Event/PostWillBeSaved.php | 1 + src/Event/PrepareApiAttributes.php | 1 + src/Event/PrepareApiData.php | 1 + src/Event/PrepareSerializedSetting.php | 1 + src/Event/PrepareUnserializedSettings.php | 1 + src/Event/PrepareUserGroups.php | 1 + src/Event/ScopeHiddenDiscussionVisibility.php | 1 + src/Event/ScopeModelVisibility.php | 1 + src/Event/ScopePostVisibility.php | 1 + src/Event/SettingWasSet.php | 1 + src/Event/UserAvatarWasChanged.php | 1 + src/Event/UserBioWasChanged.php | 1 + src/Event/UserEmailChangeWasRequested.php | 1 + src/Event/UserEmailWasChanged.php | 1 + src/Event/UserGroupsWereChanged.php | 1 + src/Event/UserLoggedIn.php | 1 + src/Event/UserLoggedOut.php | 1 + src/Event/UserPasswordWasChanged.php | 1 + src/Event/UserWasActivated.php | 1 + src/Event/UserWasDeleted.php | 1 + src/Event/UserWasRegistered.php | 1 + src/Event/UserWasRenamed.php | 1 + src/Event/UserWillBeDeleted.php | 1 + src/Event/UserWillBeSaved.php | 1 + src/Extension/Extension.php | 1 + src/Extension/ExtensionManager.php | 1 + src/Extension/ExtensionServiceProvider.php | 1 + src/Formatter/Formatter.php | 1 + src/Formatter/FormatterServiceProvider.php | 1 + src/Forum/AuthenticationResponseFactory.php | 1 + src/Forum/Controller/AbstractOAuth2Controller.php | 1 + src/Forum/Controller/AuthorizedWebAppController.php | 1 + src/Forum/Controller/ConfirmEmailController.php | 1 + src/Forum/Controller/DiscussionController.php | 1 + src/Forum/Controller/IndexController.php | 1 + src/Forum/Controller/LogInController.php | 1 + src/Forum/Controller/LogOutController.php | 1 + src/Forum/Controller/RegisterController.php | 1 + src/Forum/Controller/ResetPasswordController.php | 1 + src/Forum/Controller/SavePasswordController.php | 1 + src/Forum/Controller/WebAppController.php | 1 + src/Forum/ForumServiceProvider.php | 1 + src/Forum/UrlGenerator.php | 1 + src/Forum/WebApp.php | 1 + src/Foundation/AbstractServer.php | 1 + src/Foundation/AbstractServiceProvider.php | 1 + src/Foundation/Application.php | 1 + src/Http/AbstractServer.php | 1 + src/Http/AccessToken.php | 1 + src/Http/Controller/AbstractHtmlController.php | 1 + src/Http/Controller/AbstractWebAppController.php | 1 + src/Http/Controller/ControllerInterface.php | 1 + src/Http/FullStackServer.php | 1 + src/Http/Handler/ControllerRouteHandler.php | 1 + src/Http/Handler/RouteHandlerFactory.php | 1 + src/Http/Middleware/AuthenticateWithHeader.php | 1 + src/Http/Middleware/AuthenticateWithSession.php | 1 + src/Http/Middleware/HandleErrors.php | 1 + src/Http/Middleware/ParseJsonBody.php | 1 + src/Http/Middleware/RememberFromCookie.php | 1 + src/Http/Middleware/SetLocale.php | 1 + src/Http/Middleware/StartSession.php | 1 + src/Http/Rememberer.php | 1 + src/Http/RouteCollection.php | 1 + src/Http/SessionAuthenticator.php | 1 + src/Http/WebApp/AbstractWebApp.php | 1 + src/Http/WebApp/WebAppAssets.php | 1 + src/Http/WebApp/WebAppAssetsFactory.php | 1 + src/Http/WebApp/WebAppView.php | 1 + src/Http/WebApp/WebAppViewFactory.php | 1 + src/Install/Console/DataProviderInterface.php | 1 + src/Install/Console/DefaultsDataProvider.php | 1 + src/Install/Console/FileDataProvider.php | 1 + src/Install/Console/InstallCommand.php | 1 + src/Install/Console/UserDataProvider.php | 1 + src/Install/Controller/IndexController.php | 1 + src/Install/Controller/InstallController.php | 1 + src/Install/InstallServiceProvider.php | 1 + src/Install/Prerequisite/AbstractPrerequisite.php | 1 + src/Install/Prerequisite/Composite.php | 1 + src/Install/Prerequisite/PhpExtensions.php | 1 + src/Install/Prerequisite/PhpVersion.php | 1 + src/Install/Prerequisite/PrerequisiteInterface.php | 1 + src/Install/Prerequisite/WritablePaths.php | 1 + src/Locale/JsCompiler.php | 1 + src/Locale/LocaleManager.php | 1 + src/Locale/LocaleServiceProvider.php | 2 +- src/Locale/PrefixedYamlFileLoader.php | 1 + src/Locale/Translator.php | 1 + src/Settings/SettingsServiceProvider.php | 1 + src/Update/Console/MigrateCommand.php | 1 + src/Update/Controller/IndexController.php | 1 + src/Update/Controller/UpdateController.php | 1 + src/Update/UpdateServiceProvider.php | 1 + src/Util/Str.php | 1 + tests/Flarum/Api/Handler/FloodingExceptionHandlerTest.php | 1 + .../Api/Handler/IlluminateValidationExceptionHandlerTest.php | 1 + .../Api/Handler/InvalidAccessTokenExceptionHandlerTest.php | 1 + .../Handler/InvalidConfirmationTokenExceptionHandlerTest.php | 1 + .../Flarum/Api/Handler/MethodNotAllowedExceptionHandlerTest.php | 1 + tests/Flarum/Api/Handler/ModelNotFoundExceptionHandlerTest.php | 1 + .../Flarum/Api/Handler/PermissionDeniedExceptionHandlerTest.php | 1 + tests/Flarum/Api/Handler/RouteNotFoundExceptionHandlerTest.php | 1 + tests/Flarum/Api/Handler/TokenMismatchExceptionHandlerTest.php | 1 + tests/Flarum/Api/Handler/ValidationExceptionHandlerTest.php | 1 + 378 files changed, 378 insertions(+), 1 deletion(-) diff --git a/migrations/2015_02_24_000000_create_access_tokens_table.php b/migrations/2015_02_24_000000_create_access_tokens_table.php index 7d1682f96..1be3a93e7 100644 --- a/migrations/2015_02_24_000000_create_access_tokens_table.php +++ b/migrations/2015_02_24_000000_create_access_tokens_table.php @@ -1,4 +1,5 @@