Skip to content

Commit 981a069

Browse files
committed
Creating Tag v6.0.0-RC9 at 2020-02-25 - fixes composer scripts, cleanup unused code
1 parent 4d11c03 commit 981a069

File tree

225 files changed

+235
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+235
-234
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "huasofoundries/phppgadmin6",
3-
"version": "6.0.0-RC8",
3+
"version": "6.0.0-RC9",
44
"description": "Like phpmyadmin but for postgres",
55
"type": "project",
66
"license": [

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
// This section is made to be able to parse requests coming from PHP Builtin webserver
@@ -14,12 +14,12 @@
1414
$req_uri = substr($req_uri, 10);
1515
}
1616
$filePath = realpath(ltrim($req_uri, '/'));
17-
$new_location = 'Location: http://' . $_SERVER['HTTP_HOST'] . $req_uri;
17+
$new_location = 'Location: http://'.$_SERVER['HTTP_HOST'].$req_uri;
1818

1919
if ($filePath && // 1. check that filepath is set
2020
is_readable($filePath) && // 2. and references a readable file/folder
21-
strpos($filePath, BASE_PATH . DIRECTORY_SEPARATOR) === 0 && // 3. And is inside this folder
22-
$filePath != BASE_PATH . DIRECTORY_SEPARATOR . 'index.php' && // 4. discard circular references to index.php
21+
strpos($filePath, BASE_PATH.DIRECTORY_SEPARATOR) === 0 && // 3. And is inside this folder
22+
$filePath != BASE_PATH.DIRECTORY_SEPARATOR.'index.php' && // 4. discard circular references to index.php
2323
substr(basename($filePath), 0, 1) != '.' // 5. don't serve dotfiles
2424
) {
2525
if (strtolower(substr($filePath, -4)) == '.php') {
@@ -38,4 +38,4 @@
3838
}
3939
}
4040

41-
require_once __DIR__ . '/src/router.php';
41+
require_once __DIR__.'/src/router.php';

src/classes/ADONewConnection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
namespace PHPPgAdmin;

src/classes/ADORecordSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
namespace PHPPgAdmin;

src/classes/ADOdbException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
namespace PHPPgAdmin;

src/classes/ArrayRecordSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
namespace PHPPgAdmin;

src/classes/ContainerUtils.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
namespace PHPPgAdmin;
@@ -88,18 +88,19 @@ public static function createContainer()
8888
self::$instance = new self();
8989
}
9090

91-
$display_sizes = $conf['display_sizes'] ?? false;
91+
$display_sizes = $conf['display_sizes'] ?? false;
9292

93-
$conf['display_sizes'] = [
93+
$conf['display_sizes'] = [
9494
'schemas' => (bool) $display_sizes,
9595
'tables' => (bool) $display_sizes,
9696
];
97-
if (is_array($display_sizes)) {
98-
$conf['display_sizes'] = [
97+
if (is_array($display_sizes)) {
98+
$conf['display_sizes'] = [
9999
'schemas' => $display_sizes['schemas'] ?? in_array('schemas', $display_sizes, true),
100100
'tables' => $display_sizes['tables'] ?? in_array('tables', $display_sizes, true),
101101
];
102-
}
102+
}
103+
103104
return [self::$instance->container, self::$instance->app];
104105
}
105106

src/classes/Misc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
namespace PHPPgAdmin;

src/classes/Translations.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22

33
/**
4-
* PHPPgAdmin v6.0.0-RC8
4+
* PHPPgAdmin v6.0.0-RC9
55
*/
66

77
namespace PHPPgAdmin;

0 commit comments

Comments
 (0)