RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Use non-deprecated version of Lexer and Inflector

Browse Source
This commit is contained in:
Michael Moravec 2018-06-25 14:20:52 +02:00
parent 88d1d79516
commit 6d81d519b6
No known key found for this signature in database
GPG Key ID: 946F139F96C1C1B5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/EntityRepository.php
View File

@ -19,7 +19,7 @@
namespace Doctrine\ORM; namespace Doctrine\ORM;
use Doctrine\Common\Util\Inflector; use Doctrine\Common\Inflector\Inflector;
use Doctrine\ORM\Query\ResultSetMappingBuilder; use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Doctrine\Common\Persistence\ObjectRepository; use Doctrine\Common\Persistence\ObjectRepository;
use Doctrine\Common\Collections\Selectable; use Doctrine\Common\Collections\Selectable;

2
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
View File

@ -19,9 +19,9 @@
namespace Doctrine\ORM\Mapping\Driver; namespace Doctrine\ORM\Mapping\Driver;
use Doctrine\Common\Inflector\Inflector;
use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\Common\Persistence\Mapping\ClassMetadata;
use Doctrine\Common\Util\Inflector;
use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\AbstractSchemaManager;
use Doctrine\DBAL\Schema\SchemaException; use Doctrine\DBAL\Schema\SchemaException;
use Doctrine\DBAL\Schema\Table; use Doctrine\DBAL\Schema\Table;

4
lib/Doctrine/ORM/Query/Lexer.php
View File

@ -19,6 +19,8 @@
namespace Doctrine\ORM\Query; namespace Doctrine\ORM\Query;
use Doctrine\Common\Lexer\AbstractLexer;
/** /**
* Scans a DQL query for tokens. * Scans a DQL query for tokens.
* *
@ -27,7 +29,7 @@ namespace Doctrine\ORM\Query;
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @since 2.0 * @since 2.0
*/ */
class Lexer extends \Doctrine\Common\Lexer class Lexer extends AbstractLexer
{ {
// All tokens that are not valid identifiers must be < 100 // All tokens that are not valid identifiers must be < 100
const T_NONE = 1; const T_NONE = 1;