Merge pull request #55 from open-sausages/pulls/4.0/namespace-everything

Update for framework namespacing
This commit is contained in:
Ingo Schommer 2016-09-08 16:11:26 +12:00 committed by GitHub
commit 38dcdff18e
6 changed files with 13 additions and 14 deletions

View File

@ -1,5 +1,7 @@
<?php <?php
use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
// PDO Postgre database // PDO Postgre database
DatabaseAdapterRegistry::register(array( DatabaseAdapterRegistry::register(array(
/** @skipUpgrade */ /** @skipUpgrade */

View File

@ -2,15 +2,15 @@
namespace SilverStripe\PostgreSQL; namespace SilverStripe\PostgreSQL;
use Injector; use SilverStripe\Core\Config\Configurable;
use SilverStripe\Framework\Core\Configurable; use SilverStripe\Core\Injector\Injector;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\Connect\SS_Database; use SilverStripe\ORM\Connect\SS_Database;
use SilverStripe\ORM\PaginatedList;
use ErrorException; use ErrorException;
use Exception; use Exception;
use PaginatedList;
/** /**
* PostgreSQL connector class. * PostgreSQL connector class.
@ -396,7 +396,7 @@ class PostgreSQLDatabase extends SS_Database
// Make column selection lists // Make column selection lists
$pageClass = 'SilverStripe\\CMS\\Model\\SiteTree'; $pageClass = 'SilverStripe\\CMS\\Model\\SiteTree';
$fileClass = 'File'; $fileClass = 'SilverStripe\\Assets\\File';
$select = array( $select = array(
$pageClass => array( $pageClass => array(
'"ClassName"', '"ClassName"',

View File

@ -2,10 +2,10 @@
namespace SilverStripe\PostgreSQL; namespace SilverStripe\PostgreSQL;
use DatabaseConfigurationHelper; use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
use PDO; use SilverStripe\Dev\Install\DatabaseConfigurationHelper;
use Exception; use Exception;
use DatabaseAdapterRegistry; use PDO;
/** /**
* This is a helper class for the SS installer. * This is a helper class for the SS installer.

View File

@ -2,9 +2,9 @@
namespace SilverStripe\PostgreSQL; namespace SilverStripe\PostgreSQL;
use SilverStripe\Dev\Deprecation;
use SilverStripe\ORM\Connect\DBSchemaManager; use SilverStripe\ORM\Connect\DBSchemaManager;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
use Deprecation;
/** /**
* PostgreSQL schema manager * PostgreSQL schema manager

View File

@ -1,12 +1,8 @@
<?php <?php
use SilverStripe\Dev\SapphireTest;
use SilverStripe\PostgreSQL\PostgreSQLConnector; use SilverStripe\PostgreSQL\PostgreSQLConnector;
/**
* Description of PostgreSQLConnectorTest
*
* @author Damian
*/
class PostgreSQLConnectorTest extends SapphireTest class PostgreSQLConnectorTest extends SapphireTest
{ {
public function testSubstitutesPlaceholders() public function testSubstitutesPlaceholders()

View File

@ -1,7 +1,8 @@
<?php <?php
use SilverStripe\ORM\DB; use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\PostgreSQL\PostgreSQLDatabase; use SilverStripe\PostgreSQL\PostgreSQLDatabase;
/** /**