Skip to content

Commit 81cac45

Browse files
jailsjails
committed
Changes namespace naming convention and uses Lead as vendor namespace.
1 parent 0f67d2a commit 81cac45

Some content is hidden

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

53 files changed

+188
-176
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
composer.lock
22
composer.phar
33
vendor
4+
bin

‎.scrutinizer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
tools:
2-
php_pdepend: true
32
external_code_coverage:
43
timeout: 600

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
sudo: false
12
language: php
23

34
php:
@@ -13,8 +14,7 @@ matrix:
1314

1415
before_script:
1516
- composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH
16-
- composer self-update
17-
- composer install --no-interaction
17+
- composer install
1818
- if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'xdebug.enable = On' >> /etc/hhvm/php.ini; fi
1919

2020
script: bin/kahlan --coverage=3 --clover=clover.xml
@@ -25,4 +25,4 @@ after_success:
2525

2626
env:
2727
global:
28-
secure: DGTHG4aJhYnLDZWx+hW83ON11RUY6bd1t0t6wZuZOgB+vC+Fps/QJxh44EKfbPRKnUGNJiJgWcca83WAVEwuY2s7wEJrV7r4S5wTar6uuwcXUmds9G7HXnjUpfTtdIsqruhnwO+WufH2VCqYPNLLOykeJWyO3JcVC/BRs0kxuvE=
28+
secure: pSNrc/EfF+cwXbRFS4PjCNt1bWhaa2wi6Ta6yHvFA5b+17aj9Nt6lQS10su8za/QxcLTWSZYQCeX1dawDxVdJLIB+ZL2+chTvjprMoqGpRigKQGMPYThEwpZmhpDvSXtZBq9RBJrTXmm/FcDWtME/cIro1fPWqPmgMrWWyc9N2MZSumeM/2pBUj4r6lMrVcYXTwbYuHcbvXWisCnpLSE+q7jHxr7eyQjrrJijU2yc0ciUqza6xFYCKi1Dr1ltZpOAv0ZHtqn0vmmhherPQCcUSW07d8AI9D2gHUFRidETo6imESHvZpCCU9WNjqS5aNVXgKLYBqr+n+fHDPswcV4s9pMnFd/SlRGyTS1aqC2ysYBD/3IETQAbHnnz13IJIhespV4uk8m/6n1eYUprVgP49N6Q4XBBHEu+u4dSpJf28FN2EYN6dAQKR04J4v34xaHDBtICHbevmniAq5JitZWi7icHqxcRTIYk+Q+AxBQ+VFV02dCpapW9V7MoMYvyZfjWXiRTCGnZkgNiYErAPzY8Lonkn4izlYZSAWfuxiZEQfSVdZMkPlLv6DLaYOwkKPzVupKQpazMfAbOMH2oZ1noI96b6P/50/4XcoHhhDW2ltxwewsHUkoKY9Nkx/uTf2ou0aL/O7WQDv9xAUqwF6slDix2qicbTyv2GPsi+mMtyc=

‎composer.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@
1010
],
1111
"require": {
1212
"php": ">=5.5",
13-
"crysalead/text": "~1.0",
14-
"crysalead/set": "~1.0"
13+
"crysalead/text": "~2.0",
14+
"crysalead/set": "~2.0"
1515
},
1616
"require-dev": {
17-
"crysalead/kahlan": "~1.1"
17+
"crysalead/kahlan": "~2.0"
1818
},
1919
"autoload": {
2020
"psr-4": {
21-
"sql\\": "src/"
21+
"Lead\\Sql\\": "src/"
22+
}
23+
},
24+
"autoload-dev": {
25+
"psr-4": {
26+
"Lead\\Sql\\Spec\\": "spec/"
2227
}
2328
},
2429
"config": {

‎spec/suite/DialectSpec.php renamed to ‎spec/Suite/DialectSpec.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
namespace sql\spec\suite;
2+
namespace Lead\Sql\Spec\Suite;
33

4-
use sql\SqlException;
5-
use sql\Dialect;
6-
use kahlan\plugin\Stub;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect;
6+
7+
use Kahlan\Plugin\Stub;
78

89
describe("Dialect", function() {
910

‎spec/suite/statement/DeleteSpec.php renamed to ‎spec/Suite/Statement/DeleteSpec.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
namespace sql\spec\suite\statement;
2+
namespace Lead\Sql\Spec\Suite\Statement;
33

4-
use sql\SqlException;
5-
use sql\Dialect;
6-
use kahlan\plugin\Stub;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect;
6+
7+
use Kahlan\Plugin\Stub;
78

89
describe("Delete", function() {
910

‎spec/suite/statement/DropTableSpec.php renamed to ‎spec/Suite/Statement/DropTableSpec.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
namespace sql\spec\suite\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement;
33

4-
use sql\SqlException;
5-
use sql\Dialect;
6-
use kahlan\plugin\Stub;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect;
6+
7+
use Kahlan\Plugin\Stub;
78

89
describe("DropTable", function() {
910

‎spec/suite/statement/InsertSpec.php renamed to ‎spec/Suite/Statement/InsertSpec.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
namespace sql\spec\suite\statement;
2+
namespace Lead\Sql\Spec\Suite\Statement;
33

4-
use sql\SqlException;
5-
use sql\Dialect;
6-
use kahlan\plugin\Stub;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect;
6+
7+
use Kahlan\Plugin\Stub;
78

89
describe("Insert", function() {
910

‎spec/suite/statement/mysql/CreateTableSpec.php renamed to ‎spec/Suite/Statement/MySql/CreateTableSpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\MySql;
33

4-
use sql\SqlException;
5-
use sql\dialect\MySql;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect\MySql;
66

77
describe("MySql CreateTable", function() {
88

‎spec/suite/statement/mysql/DeleteSpec.php renamed to ‎spec/Suite/Statement/MySql/DeleteSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\MySql;
33

4-
use sql\dialect\MySql;
4+
use Lead\Sql\Dialect\MySql;
55

66
describe("MySql Delete", function() {
77

‎spec/suite/statement/mysql/DialectSpec.php renamed to ‎spec/Suite/Statement/MySql/DialectSpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\MySql;
33

4-
use sql\SqlException;
5-
use sql\dialect\MySql;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect\MySql;
66

77
describe("MySql Dialect", function() {
88

‎spec/suite/statement/mysql/InsertSpec.php renamed to ‎spec/Suite/Statement/MySql/InsertSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\MySql;
33

4-
use sql\dialect\MySql;
4+
use Lead\Sql\Dialect\MySql;
55

66
describe("MySql Insert", function() {
77

‎spec/suite/statement/mysql/SelectSpec.php renamed to ‎spec/Suite/Statement/MySql/SelectSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\MySql;
33

4-
use sql\dialect\MySql;
4+
use Lead\Sql\Dialect\MySql;
55

66
describe("MySql Select", function() {
77

‎spec/suite/statement/mysql/UpdateSpec.php renamed to ‎spec/Suite/Statement/MySql/UpdateSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\MySql;
33

4-
use sql\dialect\MySql;
4+
use Lead\Sql\Dialect\MySql;
55

66
describe("MySql Update", function() {
77

‎spec/suite/statement/postgresql/CreateTableSpec.php renamed to ‎spec/Suite/Statement/PostgreSql/CreateTableSpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\PostgreSql;
33

4-
use sql\SqlException;
5-
use sql\dialect\PostgreSql;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect\PostgreSql;
66

77
describe("PostgreSql CreateTable", function() {
88

‎spec/suite/statement/postgresql/DeleteSpec.php renamed to ‎spec/Suite/Statement/PostgreSql/DeleteSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\PostgreSql;
33

4-
use sql\dialect\PostgreSql;
4+
use Lead\Sql\Dialect\PostgreSql;
55

66
describe("PostgreSql Delete", function() {
77

‎spec/suite/statement/postgresql/DialectSpec.php renamed to ‎spec/Suite/Statement/PostgreSql/DialectSpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
namespace sql\spec\suite\statement\postgresql;
2+
namespace Lead\Sql\Spec\Suite\Statement\PostgreSql;
33

4-
use sql\SqlException;
5-
use sql\dialect\PostgreSql;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect\PostgreSql;
66

77
describe("PostgreSql Dialect", function() {
88

‎spec/suite/statement/postgresql/InsertSpec.php renamed to ‎spec/Suite/Statement/PostgreSql/InsertSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\PostgreSql;
33

4-
use sql\dialect\PostgreSql;
4+
use Lead\Sql\Dialect\PostgreSql;
55

66
describe("PostgreSql Insert", function() {
77

‎spec/suite/statement/postgresql/UpdateSpec.php renamed to ‎spec/Suite/Statement/PostgreSql/UpdateSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\mysql;
2+
namespace Lead\Sql\Spec\Suite\Statement\PostgreSql;
33

4-
use sql\dialect\PostgreSql;
4+
use Lead\Sql\Dialect\PostgreSql;
55

66
describe("PostgreSql Update", function() {
77

‎spec/suite/statement/SelectSpec.php renamed to ‎spec/Suite/Statement/SelectSpec.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
namespace sql\spec\suite\statement;
2+
namespace Lead\Sql\Spec\Suite\Statement;
33

4-
use sql\SqlException;
5-
use sql\Dialect;
6-
use kahlan\plugin\Stub;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect;
6+
7+
use Kahlan\Plugin\Stub;
78

89
describe("Select", function() {
910

‎spec/suite/statement/sqlite/CreateTableSpec.php renamed to ‎spec/Suite/Statement/Sqlite/CreateTableSpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
namespace sql\spec\suite\statement\sqlite;
2+
namespace Lead\Sql\Spec\Suite\Statement\Sqlite;
33

4-
use sql\SqlException;
5-
use sql\dialect\Sqlite;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect\Sqlite;
66

77
describe("Sqlite CreateTable", function() {
88

‎spec/suite/statement/sqlite/DialectSpec.php renamed to ‎spec/Suite/Statement/Sqlite/DialectSpec.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
2-
namespace sql\spec\suite\statement\sqlite;
2+
namespace Lead\Sql\Spec\Suite\Statement\Sqlite;
33

4-
use sql\SqlException;
5-
use sql\dialect\Sqlite;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect\Sqlite;
66

77
describe("Sqlite Dialect", function() {
88

‎spec/suite/statement/sqlite/InsertSpec.php renamed to ‎spec/Suite/Statement/Sqlite/InsertSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\sqlite;
2+
namespace Lead\Sql\Spec\Suite\Statement\Sqlite;
33

4-
use sql\dialect\Sqlite;
4+
use Lead\Sql\Dialect\Sqlite;
55

66
describe("Sqlite Insert", function() {
77

‎spec/suite/statement/sqlite/UpdateSpec.php renamed to ‎spec/Suite/Statement/Sqlite/UpdateSpec.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
2-
namespace sql\spec\suite\statement\sqlite;
2+
namespace Lead\Sql\Spec\Suite\Statement\Sqlite;
33

4-
use sql\dialect\Sqlite;
4+
use Lead\Sql\Dialect\Sqlite;
55

66
describe("Sqlite Update", function() {
77

‎spec/suite/statement/UpdateSpec.php renamed to ‎spec/Suite/Statement/UpdateSpec.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
namespace sql\spec\suite\statement;
2+
namespace Lead\Sql\Spec\Suite\Statement;
33

4-
use sql\SqlException;
5-
use sql\Dialect;
6-
use kahlan\plugin\Stub;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Dialect;
6+
7+
use Kahlan\Plugin\Stub;
78

89
describe("Update", function() {
910

‎spec/suite/StatementSpec.php renamed to ‎spec/Suite/StatementSpec.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
namespace sql\spec\suite;
2+
namespace Lead\Sql\Spec\Suite;
33

4-
use sql\SqlException;
5-
use sql\Statement;
6-
use kahlan\plugin\Stub;
4+
use Lead\Sql\SqlException;
5+
use Lead\Sql\Statement;
6+
7+
use Kahlan\Plugin\Stub;
78

89
describe("Statement", function() {
910

@@ -63,7 +64,7 @@
6364
$closure = function() {
6465
$this->statement->undefined();
6566
};
66-
expect($closure)->toThrow(new SqlException("Invalid clause `undefined` for `sql\\Statement`."));
67+
expect($closure)->toThrow(new SqlException("Invalid clause `undefined` for `Lead\\Sql\\Statement`."));
6768

6869
});
6970

‎src/Dialect.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
2-
namespace sql;
2+
namespace Lead\Sql;
33

44
use stdClass;
5-
use set\Set;
6-
use text\Text;
7-
use sql\SqlException;
5+
use Lead\Set\Set;
6+
use Lead\Text\Text;
7+
use Lead\Sql\SqlException;
88

99
/**
1010
* ANSI SQL dialect
@@ -90,12 +90,12 @@ public function __construct($config = [])
9090
{
9191
$defaults = [
9292
'classes' => [
93-
'select' => 'sql\statement\Select',
94-
'insert' => 'sql\statement\Insert',
95-
'update' => 'sql\statement\Update',
96-
'delete' => 'sql\statement\Delete',
97-
'create table' => 'sql\statement\CreateTable',
98-
'drop table' => 'sql\statement\DropTable'
93+
'select' => 'Lead\Sql\Statement\Select',
94+
'insert' => 'Lead\Sql\Statement\Insert',
95+
'update' => 'Lead\Sql\Statement\Update',
96+
'delete' => 'Lead\Sql\Statement\Delete',
97+
'create table' => 'Lead\Sql\Statement\CreateTable',
98+
'drop table' => 'Lead\Sql\Statement\DropTable'
9999
],
100100
'quoter' => null,
101101
'caster' => null,

0 commit comments

Comments
 (0)