Skip to content

Commit

Permalink
格式化
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe committed Sep 11, 2019
1 parent 3886da4 commit 0e750c7
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2017-2018 Joe Chu
Copyright (c) 2017-2019 Joe Chu

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand All @@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion app/Http/Middleware/Authenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Authenticate extends Middleware
*/
public function handle(RequestInterface $request)
{
$this->router = $this->di->get('router');
$this->router = $this->di->get('router');
$controllerName = $this->router->getControllerName();
if (in_array($controllerName, $this->except)) {
return true;
Expand Down
2 changes: 1 addition & 1 deletion app/System/Route.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function addResource($uri = '', $handle = null, $idFormat = null)
if (!$uri || !$handle) {
throw new Exception('invalid resource');
}
$this->_uri = $uri;
$this->_uri = $uri;
$this->resource[$uri] = [
'regular' => $idFormat ? $idFormat : $this->getIdFormat(),
'handle' => ucfirst($handle),
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function config($string)
*/
function getAllHeaders()
{
$headers = array();
$headers = array();
$copy_server = array(
'CONTENT_TYPE' => 'Content-Type',
'CONTENT_LENGTH' => 'Content-Length',
Expand All @@ -93,7 +93,7 @@ function getAllHeaders()
if (substr($key, 0, 5) === 'HTTP_') {
$key = substr($key, 5);
if (!isset($copy_server[$key]) || !isset($_SERVER[$key])) {
$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $key))));
$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', $key))));
$headers[$key] = $value;
}
}
Expand All @@ -106,7 +106,7 @@ function getAllHeaders()
$headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
}
elseif (isset($_SERVER['PHP_AUTH_USER'])) {
$basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
$basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
$headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass);
}
elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/service.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

$di->set('config', function () {
$config = new Config(['app' => include CONFIG_DIR . "/app.php"]);
$c = [];
$c = [];
foreach ($config->path("app.config") as $name => $item) {
$c[$name] = include $item;
}
Expand Down
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
| Default is XT
|
*/
'name' => env('APP_NAME', 'XT'),
'name' => env('APP_NAME', 'Phalcon'),

/*
|--------------------------------------------------------------------------
Expand Down
Binary file modified resources/favicon.ico
Binary file not shown.

0 comments on commit 0e750c7

Please sign in to comment.