From 1d23d294850efdc49a0a663e751d87608b8b43b7 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 5 Feb 2016 12:39:04 -0700 Subject: [PATCH] Various PSR fixes --- system/blueprints/user/group.yaml | 2 +- system/config/system.yaml | 2 +- system/src/Grav/Common/GPM/Response.php | 4 ++-- system/src/Grav/Common/User/Group.php | 4 ++-- system/src/Grav/Console/ConsoleCommand.php | 7 +++++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/system/blueprints/user/group.yaml b/system/blueprints/user/group.yaml index e627a7c9e..0adcbb5c0 100644 --- a/system/blueprints/user/group.yaml +++ b/system/blueprints/user/group.yaml @@ -41,4 +41,4 @@ form: label: PLUGIN_ADMIN.SITE_ACCESS multiple: false validate: - type: array \ No newline at end of file + type: array diff --git a/system/config/system.yaml b/system/config/system.yaml index 4099b6f67..1d21cea23 100644 --- a/system/config/system.yaml +++ b/system/config/system.yaml @@ -115,4 +115,4 @@ session: timeout: 1800 # Timeout in seconds name: grav-site # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name secure: false # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS - httponly: true # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed. \ No newline at end of file + httponly: true # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed. diff --git a/system/src/Grav/Common/GPM/Response.php b/system/src/Grav/Common/GPM/Response.php index 7c25ba70e..0e57ec0c6 100644 --- a/system/src/Grav/Common/GPM/Response.php +++ b/system/src/Grav/Common/GPM/Response.php @@ -234,7 +234,7 @@ class Response $ch = curl_init($uri); - $response = static::_curl_exec_follow($ch, $options, $callback); + $response = static::curlExecFollow($ch, $options, $callback); $errno = curl_errno($ch); if ($errno) { @@ -254,7 +254,7 @@ class Response * * @return bool|mixed */ - private static function _curl_exec_follow($ch, $options, $callback) + private static function curlExecFollow($ch, $options, $callback) { if ($callback) { curl_setopt_array( diff --git a/system/src/Grav/Common/User/Group.php b/system/src/Grav/Common/User/Group.php index 0a424f418..f32402b5a 100644 --- a/system/src/Grav/Common/User/Group.php +++ b/system/src/Grav/Common/User/Group.php @@ -36,7 +36,7 @@ class Group extends Data * * @return object */ - public static function group_exists($groupname) + public static function groupExists($groupname) { return isset(self::groups()[$groupname]); } @@ -50,7 +50,7 @@ class Group extends Data */ public static function load($groupname) { - if (self::group_exists($groupname)) { + if (self::groupExists($groupname)) { $content = self::groups()[$groupname]; } else { $content = []; diff --git a/system/src/Grav/Console/ConsoleCommand.php b/system/src/Grav/Console/ConsoleCommand.php index 0a0ffe648..349c77ac8 100644 --- a/system/src/Grav/Console/ConsoleCommand.php +++ b/system/src/Grav/Console/ConsoleCommand.php @@ -30,6 +30,9 @@ class ConsoleCommand extends Command /** * */ - protected function serve() { } + protected function serve() + { -} \ No newline at end of file + } + +}