Skip to content

Commit

Permalink
Merge pull request #72 from mbessolov/master
Browse files Browse the repository at this point in the history 
Remove usages of Doctrine Inflector
  • Loading branch information
@mbessolov
mbessolov authored Dec 17, 2020
2 parents 2dbedcc + 4440583 commit 3dd5135
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 21 deletions.
72 changes: 54 additions & 18 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,80 @@
sudo: required
os: linux
dist: trusty
language: php

matrix:
jobs:
include:
- php: 5.4.45
- php: 5.4
env: DB=mysql DB_IMAGE=mysql:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.5.38
- php: 5.5
env: DB=mysql DB_IMAGE=mysql:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.6.30
- php: 5.6
env: DB=mysql DB_IMAGE=mysql:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.0.21
- php: 7.0
env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1.7
- php: 7.1
env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.2
env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=mysql DB_IMAGE=mysql:8.0.3 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'

- php: 5.4.45
- php: 5.4
env: DB=mysql DB_IMAGE=mariadb:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.6.30
- php: 5.6
env: DB=mysql DB_IMAGE=mariadb:10.0 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1.7
- php: 7.0
env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1
env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.2
env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=mysql DB_IMAGE=mariadb:10.1 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'

- php: 5.4.45
- php: 5.4
env: DB=mysql DB_IMAGE=percona:5.5 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 5.6.30
- php: 5.6
env: DB=mysql DB_IMAGE=percona:5.6 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1.7
- php: 7.0
env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.1
env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
- php: 7.2
env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=mysql DB_IMAGE=percona:5.7 VARS='-p 33060:3306 -e MYSQL_PASSWORD=travis -e MYSQL_DATABASE=doctrine_extensions_tests -e MYSQL_USER=travis -e MYSQL_ALLOW_EMPTY_PASSWORD=yes'

- php: 5.4.45
- php: 5.4
env: DB=pgsql DB_IMAGE=postgres:9.2 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 5.5.38
- php: 5.5
env: DB=pgsql DB_IMAGE=postgres:9.3 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 5.6.30
- php: 5.6
env: DB=pgsql DB_IMAGE=postgres:9.4 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 7.0.21
- php: 7.0
env: DB=pgsql DB_IMAGE=postgres:9.5 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 7.1.7
- php: 7.1
env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
- php: 7.2
env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
# https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.3
# env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'
# Only 7.4.0 is available on Trusty, where we have the same https://github.com/oroinc/doctrine-extensions/issues/73
# - php: 7.4
# env: DB=pgsql DB_IMAGE=postgres:9.6 VARS='-p 54320:5432 -e POSTGRES_DB=doctrine_extensions_tests -e POSTGRES_USER=travis -e POSTGRES_PASSWORD=travis'

install:
- composer self-update
Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"doctrine/data-fixtures": "^1.0",
"symfony/yaml": "2.*",
"doctrine/orm": "<2.5.0",
"doctrine/common": "<3.0.0",
"squizlabs/php_codesniffer": "2.8.*"
},
"autoload": {
Expand Down
10 changes: 7 additions & 3 deletions src/Oro/ORM/Query/AST/FunctionFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Oro\ORM\Query\AST;

use Doctrine\ORM\Query\QueryException;
use Doctrine\Common\Inflector\Inflector;
use Oro\ORM\Query\AST\Platform\Functions\PlatformFunctionNode;

class FunctionFactory
Expand All @@ -21,9 +20,9 @@ public static function create($platformName, $functionName, array $parameters)
{
$className = __NAMESPACE__
. '\\Platform\\Functions\\'
. Inflector::classify(strtolower($platformName))
. static::classify(strtolower($platformName))
. '\\'
. Inflector::classify(strtolower($functionName));
. static::classify(strtolower($functionName));

if (!class_exists($className)) {
throw QueryException::syntaxError(
Expand All @@ -37,4 +36,9 @@ public static function create($platformName, $functionName, array $parameters)

return new $className($parameters);
}

private static function classify($word)
{
return \str_replace([' ', '_', '-'], '', \ucwords($word, ' _-'));
}
}

0 comments on commit 3dd5135

Please sign in to comment.