Skip to content

Commit c8ecf63

Browse files
committed
Added backslash to PHP internal functions
1 parent 5285d74 commit c8ecf63

Some content is hidden

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

71 files changed

+587
-617
lines changed

.travis.yml

+5-19
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
11
language: php
2-
cache:
3-
directories:
4-
- vendor
52
php:
6-
- 5.6
7-
- 5.5
8-
- 5.4
9-
- nightly
3+
- "5.5"
4+
- "5.6"
5+
- "7.0"
6+
- "hhvm"
107

11-
matrix:
12-
allow_failures:
13-
- php: nightly
14-
158
before_script:
16-
- alias composer="php -d zend.enable_gc=0 /usr/bin/composer"
17-
- composer require --dev satooshi/php-coveralls:dev-master
189
- composer install
19-
20-
after_script:
21-
- export COVERALLS_RUN_LOCALLY=1
22-
- php bin/coveralls -v
2310

2411
script:
2512
- bin/phpunit --coverage-text
26-
- bin/phpunit-randomizer --order rand --repeat 10
2713

2814
matrix:
2915
allow_failures:
30-
- php: hhvm-nightly
16+
- php: "hhvm"

composer.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@
3232
},
3333
"require":
3434
{
35-
"php": ">=5.4",
35+
"php": ">=5.5",
3636
"nilportugues/sql-query-formatter": "~1.2"
3737
},
38-
"require-dev":
39-
{
40-
"phpunit/phpunit": "~4.2",
41-
"fiunchinho/phpunit-randomizer": "1.0.*@dev",
42-
"fabpot/php-cs-fixer": "dev-master"
38+
"require-dev": {
39+
"phpunit/phpunit": "5.*",
40+
"fabpot/php-cs-fixer": "~1.9",
41+
"nilportugues/php_backslasher": "~0.2"
4342
},
4443
"config":
4544
{

src/Builder/BuilderException.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
/**
33
* Author: Nil Portugués Calderó <[email protected]>
44
* Date: 6/3/14
5-
* Time: 12:07 AM
5+
* Time: 12:07 AM.
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10+
1011
namespace NilPortugues\Sql\QueryBuilder\Builder;
1112

1213
/**
13-
* Class BuilderException
14-
* @package NilPortugues\Sql\QueryBuilder\BuilderInterface
14+
* Class BuilderException.
1515
*/
1616
final class BuilderException extends \Exception
1717
{

src/Builder/BuilderInterface.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
/**
33
* Author: Nil Portugués Calderó <[email protected]>
44
* Date: 6/3/14
5-
* Time: 12:07 AM
5+
* Time: 12:07 AM.
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10+
1011
namespace NilPortugues\Sql\QueryBuilder\Builder;
1112

1213
use NilPortugues\Sql\QueryBuilder\Manipulation\QueryInterface;
1314

1415
/**
15-
* Interface BuilderInterface
16-
* @package NilPortugues\Sql\QueryBuilder\BuilderInterface
16+
* Interface BuilderInterface.
1717
*/
1818
interface BuilderInterface
1919
{

src/Builder/GenericBuilder.php

+27-27
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
/**
33
* Author: Nil Portugués Calderó <[email protected]>
44
* Date: 6/3/14
5-
* Time: 12:07 AM
5+
* Time: 12:07 AM.
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10+
1011
namespace NilPortugues\Sql\QueryBuilder\Builder;
1112

1213
use NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory;
@@ -18,8 +19,7 @@
1819
use NilPortugues\Sql\QueryBuilder\Syntax\Table;
1920

2021
/**
21-
* Class Generic
22-
* @package NilPortugues\Sql\QueryBuilder\BuilderInterface
22+
* Class Generic.
2323
*/
2424
class GenericBuilder implements BuilderInterface
2525
{
@@ -59,13 +59,13 @@ class GenericBuilder implements BuilderInterface
5959
* @var array
6060
*/
6161
private $queryWriterArray = [
62-
'SELECT' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createSelectWriter',
63-
'INSERT' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createInsertWriter',
64-
'UPDATE' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createUpdateWriter',
65-
'DELETE' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createDeleteWriter',
62+
'SELECT' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createSelectWriter',
63+
'INSERT' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createInsertWriter',
64+
'UPDATE' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createUpdateWriter',
65+
'DELETE' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createDeleteWriter',
6666
'INTERSECT' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createIntersectWriter',
67-
'MINUS' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createMinusWriter',
68-
'UNION' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createUnionWriter',
67+
'MINUS' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createMinusWriter',
68+
'UNION' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createUnionWriter',
6969
'UNION ALL' => '\NilPortugues\Sql\QueryBuilder\Builder\Syntax\WriterFactory::createUnionAllWriter',
7070
];
7171

@@ -75,13 +75,13 @@ class GenericBuilder implements BuilderInterface
7575
* @var array
7676
*/
7777
private $queryWriterInstances = [
78-
'SELECT' => null,
79-
'INSERT' => null,
80-
'UPDATE' => null,
81-
'DELETE' => null,
78+
'SELECT' => null,
79+
'INSERT' => null,
80+
'UPDATE' => null,
81+
'DELETE' => null,
8282
'INTERSECT' => null,
83-
'MINUS' => null,
84-
'UNION' => null,
83+
'MINUS' => null,
84+
'UNION' => null,
8585
'UNION ALL' => null,
8686
];
8787

@@ -107,7 +107,7 @@ public function select($table = null, array $columns = null)
107107
/**
108108
* @param \NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery
109109
*
110-
*@return \NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery
110+
*@return \NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery
111111
*/
112112
protected function injectBuilder(AbstractBaseQuery $query)
113113
{
@@ -118,7 +118,7 @@ protected function injectBuilder(AbstractBaseQuery $query)
118118
* @param string $table
119119
* @param array $values
120120
*
121-
*@return AbstractBaseQuery
121+
*@return AbstractBaseQuery
122122
*/
123123
public function insert($table = null, array $values = null)
124124
{
@@ -129,7 +129,7 @@ public function insert($table = null, array $values = null)
129129
* @param string $table
130130
* @param array $values
131131
*
132-
*@return AbstractBaseQuery
132+
*@return AbstractBaseQuery
133133
*/
134134
public function update($table = null, array $values = null)
135135
{
@@ -210,6 +210,7 @@ public function writeFormatted(QueryInterface $query)
210210
* @param bool $resetPlaceholders
211211
*
212212
* @return string
213+
*
213214
* @throws \RuntimeException
214215
*/
215216
public function write(QueryInterface $query, $resetPlaceholders = true)
@@ -240,10 +241,10 @@ public function writeJoin(Select $select)
240241
$this->whereWriter = WriterFactory::createWhereWriter($this, $this->placeholderWriter);
241242
}
242243

243-
$sql = ($select->getJoinType()) ? "{$select->getJoinType()} " : "";
244-
$sql .= "JOIN ";
244+
$sql = ($select->getJoinType()) ? "{$select->getJoinType()} " : '';
245+
$sql .= 'JOIN ';
245246
$sql .= $this->writeTableWithAlias($select->getTable());
246-
$sql .= " ON ";
247+
$sql .= ' ON ';
247248
$sql .= $this->whereWriter->writeWhere($select->getJoinCondition());
248249

249250
return $sql;
@@ -278,7 +279,6 @@ public function writeTableAlias($alias)
278279
* @param Table $table
279280
*
280281
* @return string
281-
*
282282
*/
283283
public function writeTableName(Table $table)
284284
{
@@ -314,7 +314,7 @@ public function writeTable(Table $table)
314314
*/
315315
public function writeValues(array &$values)
316316
{
317-
array_walk(
317+
\array_walk(
318318
$values,
319319
function (&$value) {
320320
$value = $this->writePlaceholderValue($value);
@@ -349,15 +349,15 @@ public function writeConjunction($operator)
349349
*/
350350
public function writeIsNull()
351351
{
352-
return " IS NULL";
352+
return ' IS NULL';
353353
}
354354

355355
/**
356356
* @return string
357357
*/
358358
public function writeIsNotNull()
359359
{
360-
return " IS NOT NULL";
360+
return ' IS NOT NULL';
361361
}
362362

363363
/**
@@ -392,8 +392,8 @@ protected function writeColumnAll()
392392
protected function createQueryObject($queryPart)
393393
{
394394
if (null === $this->queryWriterInstances[$queryPart]) {
395-
$this->queryWriterInstances[$queryPart] = call_user_func_array(
396-
explode('::', $this->queryWriterArray[$queryPart]),
395+
$this->queryWriterInstances[$queryPart] = \call_user_func_array(
396+
\explode('::', $this->queryWriterArray[$queryPart]),
397397
[$this, $this->placeholderWriter]
398398
);
399399
}

src/Builder/MySqlBuilder.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
/**
33
* Author: Nil Portugués Calderó <[email protected]>
44
* Date: 6/3/14
5-
* Time: 12:07 AM
5+
* Time: 12:07 AM.
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*/
10+
1011
namespace NilPortugues\Sql\QueryBuilder\Builder;
1112

1213
use NilPortugues\Sql\QueryBuilder\Syntax\Column;
1314
use NilPortugues\Sql\QueryBuilder\Syntax\Table;
1415

1516
/**
16-
* Class MySqlBuilder
17-
* @package NilPortugues\Sql\QueryBuilder\Renderer
17+
* Class MySqlBuilder.
1818
*/
1919
class MySqlBuilder extends GenericBuilder
2020
{

src/Builder/Syntax/AbstractBaseWriter.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Author: Nil Portugués Calderó <[email protected]>
44
* Date: 12/24/14
5-
* Time: 1:14 PM
5+
* Time: 1:14 PM.
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
@@ -14,8 +14,7 @@
1414
use NilPortugues\Sql\QueryBuilder\Manipulation\AbstractBaseQuery;
1515

1616
/**
17-
* Class AbstractBaseWriter
18-
* @package NilPortugues\Sql\QueryBuilder\Builder\Syntax
17+
* Class AbstractBaseWriter.
1918
*/
2019
abstract class AbstractBaseWriter
2120
{
@@ -40,7 +39,7 @@ abstract class AbstractBaseWriter
4039
*/
4140
public function __construct(GenericBuilder $writer, PlaceholderWriter $placeholder)
4241
{
43-
$this->writer = $writer;
42+
$this->writer = $writer;
4443
$this->placeholderWriter = $placeholder;
4544

4645
$this->columnWriter = WriterFactory::createColumnWriter($writer, $placeholder);
@@ -75,7 +74,7 @@ public static function writeWhereCondition(
7574
) {
7675
if (!is_null($class->getWhere())) {
7776
$whereWriter = WriterFactory::createWhereWriter($writer, $placeholderWriter);
78-
$parts[] = "WHERE {$whereWriter->writeWhere($class->getWhere())}";
77+
$parts[] = "WHERE {$whereWriter->writeWhere($class->getWhere())}";
7978
}
8079
}
8180

@@ -90,7 +89,7 @@ public static function writeLimitCondition(
9089
array &$parts
9190
) {
9291
if (!is_null($class->getLimitStart())) {
93-
$start = $placeholderWriter->add($class->getLimitStart());
92+
$start = $placeholderWriter->add($class->getLimitStart());
9493
$parts[] = "LIMIT {$start}";
9594
}
9695
}

src/Builder/Syntax/AbstractSetWriter.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Author: Nil Portugués Calderó <[email protected]>
44
* Date: 12/24/14
5-
* Time: 12:55 PM
5+
* Time: 12:55 PM.
66
*
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
@@ -14,8 +14,7 @@
1414
use NilPortugues\Sql\QueryBuilder\Syntax\QueryPartInterface;
1515

1616
/**
17-
* Class AbstractSetWriter
18-
* @package NilPortugues\Sql\QueryBuilder\Builder\Syntax
17+
* Class AbstractSetWriter.
1918
*/
2019
abstract class AbstractSetWriter
2120
{
@@ -47,6 +46,6 @@ protected function abstractWrite(QueryPartInterface $setClass, $setOperation, $g
4746
$selects[] = $this->writer->write($select);
4847
}
4948

50-
return implode("\n".$glue."\n", $selects);
49+
return \implode("\n".$glue."\n", $selects);
5150
}
5251
}

0 commit comments

Comments
 (0)