Skip to content

Commit e4eed51

Browse files
gertvdbgertvdb
committed
Remove absolete require statements
1 parent 229aabb commit e4eed51

File tree

90 files changed

+715
-1022
lines changed

Some content is hidden

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

90 files changed

+715
-1022
lines changed

‎lib/addon/creole/database/sfCreoleDatabase.class.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,6 @@ public function connect()
121121
// get creole class path
122122
$classPath = $this->getParameter('classpath');
123123

124-
// include the creole file
125-
if ($classPath === null)
126-
{
127-
require_once('creole/Creole.php');
128-
}
129-
else
130-
{
131-
require_once($classPath);
132-
}
133-
134124
// set our flags
135125
$noAssocLower = $this->getParameter('no_assoc_lower', false);
136126
$persistent = $this->getParameter('persistent', false);

‎lib/addon/propel/builder/SfExtensionObjectBuilder.php‎

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

3-
require_once 'propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php';
4-
53
/*
64
* This file is part of the symfony package.
75
* (c) 2004-2006 Fabien Potencier <[email protected]>
@@ -43,15 +41,15 @@ protected function addClassOpen(&$script)
4341
* $tableDesc
4442
*
4543
* @package ".$this->getPackage()."
46-
*/
44+
*/
4745
class ".$this->getClassname()." extends $baseClassname
4846
{";
4947
}
5048

5149
/**
5250
* Closes class.
5351
* @param string &$script The script will be modified in this method.
54-
*/
52+
*/
5553
protected function addClassClose(&$script)
5654
{
5755
$script .= "

‎lib/addon/propel/builder/SfExtensionPeerBuilder.php‎

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

3-
require_once 'propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php';
4-
53
/*
64
* This file is part of the symfony package.
75
* (c) 2004-2006 Fabien Potencier <[email protected]>
@@ -47,15 +45,15 @@ protected function addClassOpen(&$script)
4745
* $tableDesc
4846
*
4947
* @package ".$this->getPackage()."
50-
*/
48+
*/
5149
class ".$this->getClassname()." extends $baseClassname
5250
{";
5351
}
5452

5553
/**
5654
* Closes class.
5755
* @param string &$script The script will be modified in this method.
58-
*/
56+
*/
5957
protected function addClassClose(&$script)
6058
{
6159
$script .= "

‎lib/addon/propel/builder/SfMapBuilderBuilder.php‎

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

3-
require_once 'propel/engine/builder/om/php5/PHP5MapBuilderBuilder.php';
4-
53
/*
64
* This file is part of the symfony package.
75
* (c) 2004-2006 Fabien Potencier <[email protected]>
@@ -48,7 +46,7 @@ protected function addDoBuild(&$script)
4846
{
4947
$sizes[$col->getPhpName()] = !$col->getSize() ? 'null' : $col->getSize();
5048
}
51-
49+
5250
$script = preg_replace_callback("/\\\$tMap\->addColumn\('([^']+)', '([^']+)', '([^']+)', CreoleTypes\:\:VARCHAR, (false|true)\)/", function($m){
5351
return '"\\\$tMap->addColumn(\'$m[1]\', \'$m[2]\', \'$m[3]\', CreoleTypes::VARCHAR, $m[4], {$sizes[\'$m[2]\']})"';
5452
}, $script);

‎lib/addon/propel/builder/SfMultiExtendObjectBuilder.php‎

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

3-
require_once 'propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php';
4-
53
/*
64
* This file is part of the symfony package.
75
* (c) 2004-2006 Fabien Potencier <[email protected]>

‎lib/addon/propel/builder/SfObjectBuilder.php‎

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

3-
require_once 'propel/engine/builder/om/php5/PHP5ComplexObjectBuilder.php';
4-
53
/*
64
* This file is part of the symfony package.
75
* (c) 2004-2006 Fabien Potencier <[email protected]>

‎lib/addon/propel/builder/SfPeerBuilder.php‎

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

3-
require_once 'propel/engine/builder/om/php5/PHP5ComplexPeerBuilder.php';
4-
53
/*
64
* This file is part of the symfony package.
75
* (c) 2004-2006 Fabien Potencier <[email protected]>

‎lib/addon/propel/database/sfPropelDatabase.class.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public function addConfig()
6565

6666
if ($dsn = $this->getParameter('dsn'))
6767
{
68-
require_once('creole/Creole.php');
6968
$params = Creole::parseDSN($dsn);
7069

7170
$options = array('phptype', 'hostspec', 'database', 'username', 'password', 'port', 'protocol', 'encoding', 'persistent', 'socket','compat_assoc_lower','compat_rtrim_string');

‎lib/vendor/creole/CallableStatement.php‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
* <http://creole.phpdb.org>.
2020
*/
2121

22-
require_once 'creole/PreparedStatement.php';
23-
2422
/**
2523
* Interface for callable statements.
2624
*
@@ -29,56 +27,56 @@
2927
* @package creole
3028
*/
3129
interface CallableStatement extends PreparedStatement {
32-
30+
3331
/**
3432
* Register a parameter as an output param.
3533
* @param string $paramIndex The stored procedure param name (e.g. @val1).
3634
* @param int $sqlType The type of the parameter (e.g. Type::BIT)
3735
* @param int $maxLength The maximum expected length (size) of output parameter.
3836
*/
3937
public function registerOutParameter($paramIndex, $sqlType, $maxLength = null);
40-
38+
4139
/**
42-
*
40+
*
4341
* @param mixed $paramIndex Parameter name (e.g. "@var1").
4442
* @return array
4543
* @throws SQLException if $paramIndex was not bound as output variable.
4644
*/
4745
public function getArray($paramIndex);
48-
46+
4947
/**
50-
*
48+
*
5149
* @param mixed $paramIndex Parameter name (e.g. "@var1").
5250
* @return boolean
5351
* @throws SQLException if $paramIndex was not bound as output variable.
5452
*/
55-
public function getBoolean($paramIndex);
56-
53+
public function getBoolean($paramIndex);
54+
5755
/**
58-
*
56+
*
5957
* @param mixed $paramIndex Parameter name (e.g. "@var1").
6058
* @return Blob blob object
6159
* @throws SQLException if $paramIndex was not bound as output variable.
6260
*/
6361
public function getBlob($paramIndex);
64-
62+
6563
/**
6664
* @param mixed $paramIndex Column name (string) or index (int).
6765
* @return Clob clob object.
6866
*/
69-
public function getClob($paramIndex);
70-
67+
public function getClob($paramIndex);
68+
7169
/**
7270
* Return a formatted date.
73-
*
74-
* The default format for dates returned is preferred (in your locale, as specified using setlocale())
71+
*
72+
* The default format for dates returned is preferred (in your locale, as specified using setlocale())
7573
* format w/o time (i.e. strftime("%x", $val)). Override this by specifying a format second parameter. You
7674
* can also specify a date()-style formatter; if you do, make sure there are no "%" symbols in your format string.
77-
*
75+
*
7876
* @param mixed $column Column name (string) or index (int) starting with 1 (if ResultSet::FETCHMODE_NUM was used).
7977
* @param string $format Date formatter for use w/ strftime() or date() (it will choose based on examination of format string)
8078
* If format is NULL, then the integer unix timestamp will be returned (no formatting performed).
81-
* @return mixed Formatted date, or integer unix timestamp (using 00:00:00 for time) if $format was null.
79+
* @return mixed Formatted date, or integer unix timestamp (using 00:00:00 for time) if $format was null.
8280
* @throws SQLException - If the column specified is not a valid key in current field array.
8381
*/
8482
public function getDate($column, $format = '%x');
@@ -87,43 +85,43 @@ public function getDate($column, $format = '%x');
8785
* @param mixed $paramIndex Column name (string) or index (int).
8886
* @return float
8987
*/
90-
public function getFloat($paramIndex);
88+
public function getFloat($paramIndex);
9189

9290
/**
9391
* @param mixed $paramIndex Column name (string) or index (int).
9492
* @return int
9593
*/
96-
public function getInt($paramIndex);
94+
public function getInt($paramIndex);
9795

9896
/**
9997
* @param mixed $paramIndex Column name (string) or index (int).
10098
* @return string
10199
*/
102-
public function getString($paramIndex);
103-
100+
public function getString($paramIndex);
101+
104102
/**
105103
* Return a formatted time.
106-
*
107-
* The default format for times returned is preferred (in your locale, as specified using setlocale())
104+
*
105+
* The default format for times returned is preferred (in your locale, as specified using setlocale())
108106
* format w/o date (i.e. strftime("%X", $val)). Override this by specifying a format second parameter. You
109107
* can also specify a date()-style formatter; if you do, make sure there are no "%" symbols in your format string.
110-
*
108+
*
111109
* @param mixed $column Column name (string) or index (int) starting with 1 (if ResultSet::FETCHMODE_NUM was used).
112110
* @param string $format Date formatter for use w/ strftime() or date() (it will choose based on examination of format string)
113111
* If format is NULL, then the integer unix timestamp will be returned (no formatting performed).
114-
* @return mixed Formatted time, or integer unix timestamp (using today's date) if $format was null.
112+
* @return mixed Formatted time, or integer unix timestamp (using today's date) if $format was null.
115113
* @throws SQLException - If the column specified is not a valid key in current field array.
116114
*/
117115
public function getTime($column, $format = '%X');
118116

119117
/**
120118
* Return a formatted timestamp.
121-
*
119+
*
122120
* The default format for timestamp is ISO standard YYYY-MM-DD HH:MM:SS (i.e. date('Y-m-d H:i:s', $val).
123121
* Override this by specifying a format second parameter. You can also specify a strftime()-style formatter.
124-
*
122+
*
125123
* Hint: if you want to get the unix timestamp use the "U" formatter string.
126-
*
124+
*
127125
* @param mixed $column Column name (string) or index (int) starting with 1 (if ResultSet::FETCHMODE_NUM was used).
128126
* @param string $format Date formatter for use w/ strftime() or date() (it will choose based on examination of format string)
129127
* If format is NULL, then the integer unix timestamp will be returned (no formatting performed).

‎lib/vendor/creole/common/ResultSetCommon.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ public function __destruct()
125125
*/
126126
public function getIterator(): \Traversable
127127
{
128-
require_once 'creole/ResultSetIterator.php';
129128
return new ResultSetIterator($this);
130129
}
131130

@@ -401,8 +400,6 @@ public function getClobOrNull($column): ?Clob
401400
*/
402401
public function getClob($column): Clob
403402
{
404-
require_once 'creole/util/Clob.php';
405-
406403
$value = $this->get($column);
407404
if ($value === null) {
408405
return new Clob();

0 commit comments

Comments
 (0)