Skip to content

Commit

Permalink
refactoring namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
sourcegr committed Oct 1, 2020
1 parent 181c95e commit 83125f2
Show file tree
Hide file tree
Showing 22 changed files with 70 additions and 73 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SREQB
QB
===
A PHP Query Builder
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sourcegr/sreqb",
"name": "sourcegr/query-builder",
"type": "library",
"description": "SREQB is a query builder for easy SQL queries.",
"description": "QB is a query builder for easy SQL queries.",
"license": "MIT",
"authors": [
{
Expand All @@ -15,10 +15,10 @@
"ext-pdo": "*"
},
"autoload": {
"psr-4": {"Sre\\": "src/"}
"psr-4": {"Sourcegr\\QueryBuilder\\": "src/"}
},
"autoload-dev": {
"psr-4": {"Test\\": "test/"}
"psr-4": {"Tests\\": "tests/"}
},
"require-dev": {
"phpunit/phpunit": "^9.3"
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/QueryBuilder/DB.php → src/DB.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php


namespace Sre\QueryBuilder;
namespace Sourcegr\QueryBuilder;


use Sre\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\QueryBuilder\Grammars\MySQL;
use InvalidArgumentException;

class DB
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


namespace Sre\QueryBuilder\Grammars;
namespace Sourcegr\QueryBuilder\Exceptions;

use Exception;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


namespace Sre\QueryBuilder\Grammars;
namespace Sourcegr\QueryBuilder\Exceptions;

use Exception;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


namespace Sre\QueryBuilder\Grammars;
namespace Sourcegr\QueryBuilder\Exceptions;

use Exception;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


namespace Sre\QueryBuilder\Grammars;
namespace Sourcegr\QueryBuilder\Exceptions;

use Exception;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php


namespace Sre\QueryBuilder\Grammars;
namespace Sourcegr\QueryBuilder\Grammars;


use PDO;

use function PHPUnit\Framework\throwException;

class MySQL
{
Expand Down Expand Up @@ -114,7 +114,7 @@ public function delete($sqlString, $sqlParams)

if ($res === false) {
$info = $st->errorInfo();
throw new UpdateErrorException($info[0] . ': ' . $info[2] . ' (' . $info[1] . ')');
throw new DeleteErrorException($info[0] . ': ' . $info[2] . ' (' . $info[1] . ')');
}

return $st->rowCount();
Expand Down
2 changes: 1 addition & 1 deletion src/QueryBuilder/NotNullAdder.php → src/NotNullAdder.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


namespace Sre\QueryBuilder;
namespace Sourcegr\QueryBuilder;


class NotNullAdder
Expand Down
2 changes: 1 addition & 1 deletion src/QueryBuilder/Params.php → src/Params.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


namespace Sre\QueryBuilder;
namespace Sourcegr\QueryBuilder;


use function PHPUnit\Framework\isNull;
Expand Down
8 changes: 2 additions & 6 deletions src/QueryBuilder/QueryBuilder.php → src/QueryBuilder.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?php


namespace Sre\QueryBuilder;
namespace Sourcegr\QueryBuilder;


use InvalidArgumentException;
use Sre\QueryBuilder\Grammars\MySQL;
use Sre\QueryBuilder\Grammars\UpdateErrorException;
use Sourcegr\QueryBuilder\Exceptions\UpdateErrorException;

class QueryBuilder
{
Expand All @@ -28,9 +27,6 @@ class QueryBuilder

private $sqlParams = [];

/**
* @var MySQL
*/
private $grammar;


Expand Down
2 changes: 1 addition & 1 deletion src/QueryBuilder/Raw.php → src/Raw.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


namespace Sre\QueryBuilder;
namespace Sourcegr\QueryBuilder;


class Raw
Expand Down
8 changes: 4 additions & 4 deletions test/DBTest.php → tests/DBTest.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Test;
namespace Tests;


use Sre\QueryBuilder\QueryBuilder;
use Sre\QueryBuilder\DB;
use Test\Stub\Grammar;
use Sourcegr\QueryBuilder\QueryBuilder;
use Sourcegr\QueryBuilder\DB;
use Tests\Stub\Grammar;
use ArgumentCountError;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
Expand Down
16 changes: 8 additions & 8 deletions test/DeleteTest.php → tests/DeleteTest.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php

namespace Test;
namespace Tests;


use Sre\QueryBuilder\QueryBuilder;
use Sre\QueryBuilder\DB;
use Sre\QueryBuilder\Raw;
use Sre\QueryBuilder\Grammars\MySQL;
use Sre\QueryBuilder\Grammars\DeleteErrorException;
use PHPUnit\Framework\TestCase;
use Test\Stub\Grammar;
use Sourcegr\QueryBuilder\QueryBuilder;
use Sourcegr\QueryBuilder\DB;
use Sourcegr\QueryBuilder\Raw;
use Sourcegr\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\Exceptions\DeleteErrorException;
use Tests\Stub\Grammar;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;

class DeleteTest extends TestCase
{
Expand Down
4 changes: 2 additions & 2 deletions test/Grammars/MySQLTest.php → tests/Grammars/MySQLTest.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Test\Grammars;
namespace Tests\Grammars;

use Sre\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\Grammars\MySQL;
use PHPUnit\Framework\TestCase;

class MySQLTest extends TestCase
Expand Down
16 changes: 8 additions & 8 deletions test/InsertTest.php → tests/InsertTest.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php

namespace Test;
namespace Tests;


use Sre\QueryBuilder\QueryBuilder;
use Sre\QueryBuilder\DB;
use Sre\QueryBuilder\Raw;
use Sre\QueryBuilder\Grammars\MySQL;
use Sre\QueryBuilder\Grammars\InsertErrorException;
use PHPUnit\Framework\TestCase;
use Test\Stub\Grammar;
use Sourcegr\QueryBuilder\QueryBuilder;
use Sourcegr\QueryBuilder\DB;
use Sourcegr\QueryBuilder\Raw;
use Sourcegr\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\Exceptions\InsertErrorException;
use Tests\Stub\Grammar;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;

class InsertTest extends TestCase
{
Expand Down
4 changes: 2 additions & 2 deletions test/ParamsTest.php → tests/ParamsTest.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Test;
namespace Tests;


use Sre\QueryBuilder\Params;
use Sourcegr\QueryBuilder\Params;
use PHPUnit\Framework\TestCase;

class ParamsTest extends TestCase
Expand Down
11 changes: 6 additions & 5 deletions test/QueryBuilderTest.php → tests/QueryBuilderTest.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?php

namespace Test;
namespace Tests;


use Sre\QueryBuilder\QueryBuilder;
use Sre\QueryBuilder\DB;
use Sre\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\QueryBuilder;
use Sourcegr\QueryBuilder\DB;
use Sourcegr\QueryBuilder\Grammars\MySQL;
use Tests\Stub\Grammar;
use PHPUnit\Framework\TestCase;
use \Test\Stub\Grammar;


class QueryBuilderTest extends TestCase
{
Expand Down
12 changes: 6 additions & 6 deletions test/SelectTest.php → tests/SelectTest.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php

namespace Test;
namespace Tests;


use Sre\QueryBuilder\QueryBuilder;
use Sre\QueryBuilder\DB;
use Sre\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\QueryBuilder;
use Sourcegr\QueryBuilder\DB;
use Sourcegr\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\Raw;
use Tests\Stub\Grammar;
use PHPUnit\Framework\TestCase;
use Sre\QueryBuilder\Raw;
use \Test\Stub\Grammar;

class SelectTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion test/Stub/Grammar.php → tests/Stub/Grammar.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Test\Stub;
namespace Tests\Stub;

class Grammar
{
Expand Down
16 changes: 8 additions & 8 deletions test/UpdateTest.php → tests/UpdateTest.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php

namespace Test;
namespace Tests;


use Sre\QueryBuilder\QueryBuilder;
use Sre\QueryBuilder\DB;
use Sre\QueryBuilder\Raw;
use Sre\QueryBuilder\Grammars\MySQL;
use Sre\QueryBuilder\Grammars\UpdateErrorException;
use PHPUnit\Framework\TestCase;
use Test\Stub\Grammar;
use Sourcegr\QueryBuilder\QueryBuilder;
use Sourcegr\QueryBuilder\DB;
use Sourcegr\QueryBuilder\Raw;
use Sourcegr\QueryBuilder\Grammars\MySQL;
use Sourcegr\QueryBuilder\Exceptions\UpdateErrorException;
use Tests\Stub\Grammar;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;

class UpdateTest extends TestCase
{
Expand Down

0 comments on commit 83125f2

Please sign in to comment.