Updating vendors

skala
Julio Montoya 13 years ago
parent acde41f6f1
commit e6388b3830
  1. 2
      vendor/autoload.php
  2. 3
      vendor/composer/autoload_namespaces.php
  3. 6
      vendor/composer/autoload_real.php
  4. 232
      vendor/composer/installed.json
  5. 8
      vendor/doctrine/orm/lib/Doctrine/ORM/Proxy/ProxyFactory.php
  6. 1
      vendor/fzaninotto/faker/readme.md
  7. 57
      vendor/gedmo/doctrine-extensions/doc/tree.md
  8. 1
      vendor/gedmo/doctrine-extensions/lib/Gedmo/SoftDeleteable/Mapping/Validator.php
  9. 1
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Timestampable/Mapping/Driver/Annotation.php
  10. 1
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Timestampable/Mapping/Driver/Xml.php
  11. 1
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Timestampable/Mapping/Driver/Yaml.php
  12. 27
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Tree/Mapping/Driver/Yaml.php
  13. 4
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Tree/Mapping/Validator.php
  14. 15
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Tree/Strategy/AbstractMaterializedPath.php
  15. 2
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Uploadable/FilenameGenerator/FilenameGeneratorAlphanumeric.php
  16. 3
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Uploadable/FilenameGenerator/FilenameGeneratorInterface.php
  17. 2
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Uploadable/FilenameGenerator/FilenameGeneratorSha1.php
  18. 8
      vendor/gedmo/doctrine-extensions/lib/Gedmo/Uploadable/UploadableListener.php
  19. 2
      vendor/gedmo/doctrine-extensions/tests/Gedmo/Uploadable/FilenameGenerator/FilenameGeneratorAlphanumericTest.php
  20. 4
      vendor/gedmo/doctrine-extensions/tests/Gedmo/Uploadable/UploadableEntityTest.php

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
return ComposerAutoloaderInit475f7ef074dbc0ddf770b6ee86e51c63::getLoader();
return ComposerAutoloaderInitb343d933ddd40380e938248e1d446981::getLoader();

@ -31,7 +31,7 @@ return array(
'Pagerfanta\\' => $vendorDir . '/pagerfanta/pagerfanta/src/',
'Monolog' => $vendorDir . '/monolog/monolog/src/',
'Knp\\Menu\\' => $vendorDir . '/knplabs/knp-menu/src/',
'Gedmo' => array($baseDir . '/vendor/gedmo/doctrine-extensions/lib\'', $vendorDir . '/gedmo/doctrine-extensions/lib/'),
'Gedmo' => array($baseDir . '/vendor/gedmo/doctrine-extensions/lib', $vendorDir . '/gedmo/doctrine-extensions/lib/'),
'Faker' => $vendorDir . '/fzaninotto/faker/src/',
'Entity' => $baseDir . '/main/inc/',
'EmanueleMinotto' => $vendorDir . '/emanueleminotto/faker-service-provider/src/',
@ -47,4 +47,5 @@ return array(
'Dflydev\\Silex\\Provider\\DoctrineOrm' => $vendorDir . '/dflydev/doctrine-orm-service-provider/src',
'Dflydev\\Pimple\\Provider\\DoctrineOrm' => $vendorDir . '/dflydev/doctrine-orm-service-provider/src',
'Dflydev\\Cilex\\Provider\\DoctrineOrm' => $vendorDir . '/dflydev/doctrine-orm-service-provider/src',
'ChamiloLMS' => $baseDir . '/src/',
);

@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
class ComposerAutoloaderInit475f7ef074dbc0ddf770b6ee86e51c63
class ComposerAutoloaderInitb343d933ddd40380e938248e1d446981
{
private static $loader;
@ -19,9 +19,9 @@ class ComposerAutoloaderInit475f7ef074dbc0ddf770b6ee86e51c63
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit475f7ef074dbc0ddf770b6ee86e51c63', 'loadClassLoader'));
spl_autoload_register(array('ComposerAutoloaderInitb343d933ddd40380e938248e1d446981', 'loadClassLoader'));
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit475f7ef074dbc0ddf770b6ee86e51c63', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb343d933ddd40380e938248e1d446981', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);

@ -1086,53 +1086,6 @@
"tree"
]
},
{
"name": "fzaninotto/faker",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
"reference": "d2bd9144075c0bb05fc14844e1446c2054b5da66"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d2bd9144075c0bb05fc14844e1446c2054b5da66",
"reference": "d2bd9144075c0bb05fc14844e1446c2054b5da66",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2013-02-27 10:20:31",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Faker": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "François Zaninotto"
}
],
"description": "Faker is a PHP library that generates fake data for you.",
"keywords": [
"data",
"faker",
"fixtures"
]
},
{
"name": "emanueleminotto/faker-service-provider",
"version": "dev-master",
@ -2035,44 +1988,45 @@
]
},
{
"name": "doctrine/orm",
"name": "dflydev/doctrine-orm-service-provider",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "2372a85d9fff9f55197bc1b4f434e7cee469706b"
"url": "https://github.com/dflydev/dflydev-doctrine-orm-service-provider.git",
"reference": "v1.0.0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2372a85d9fff9f55197bc1b4f434e7cee469706b",
"reference": "2372a85d9fff9f55197bc1b4f434e7cee469706b",
"url": "https://api.github.com/repos/dflydev/dflydev-doctrine-orm-service-provider/zipball/v1.0.0",
"reference": "v1.0.0",
"shasum": ""
},
"require": {
"doctrine/dbal": ">=2.4-dev,<2.5-dev",
"ext-pdo": "*",
"php": ">=5.3.2",
"symfony/console": "2.*"
"doctrine/orm": ">=2.3,<3.0",
"php": ">=5.3.3",
"pimple/pimple": "1.*@dev"
},
"require-dev": {
"cilex/cilex": "1.*@dev",
"silex/silex": "1.*@dev"
},
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
"dflydev/psr0-resource-locator-service-provider": "1.0.*@dev"
},
"time": "2013-03-01 00:02:20",
"bin": [
"bin/doctrine",
"bin/doctrine.php"
],
"time": "2012-12-30 23:41:22",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.4.x-dev"
"dev-master": "1.0-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Doctrine\\ORM\\": "lib/"
"Dflydev\\Cilex\\Provider\\DoctrineOrm": "src",
"Dflydev\\Pimple\\Provider\\DoctrineOrm": "src",
"Dflydev\\Silex\\Provider\\DoctrineOrm": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -2081,71 +2035,64 @@
],
"authors": [
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/"
},
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": "http://www.instaclick.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
"name": "Dragonfly Development Inc.",
"email": "info@dflydev.com",
"homepage": "http://dflydev.com"
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
"name": "Beau Simensen",
"email": "beau@dflydev.com",
"homepage": "http://beausimensen.com"
}
],
"description": "Object-Relational-Mapper for PHP",
"homepage": "http://www.doctrine-project.org",
"description": "Doctrine ORM Service Provider",
"keywords": [
"database",
"orm"
"cilex",
"doctrine",
"orm",
"pimple",
"silex"
]
},
{
"name": "dflydev/doctrine-orm-service-provider",
"name": "doctrine/orm",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/dflydev/dflydev-doctrine-orm-service-provider.git",
"reference": "v1.0.0"
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "b30d6dfd8e88b67f63f2e154c0828d8e9ab7b8a0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dflydev/dflydev-doctrine-orm-service-provider/zipball/v1.0.0",
"reference": "v1.0.0",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/b30d6dfd8e88b67f63f2e154c0828d8e9ab7b8a0",
"reference": "b30d6dfd8e88b67f63f2e154c0828d8e9ab7b8a0",
"shasum": ""
},
"require": {
"doctrine/orm": ">=2.3,<3.0",
"php": ">=5.3.3",
"pimple/pimple": "1.*@dev"
},
"require-dev": {
"cilex/cilex": "1.*@dev",
"silex/silex": "1.*@dev"
"doctrine/dbal": ">=2.4-dev,<2.5-dev",
"ext-pdo": "*",
"php": ">=5.3.2",
"symfony/console": "2.*"
},
"suggest": {
"dflydev/psr0-resource-locator-service-provider": "1.0.*@dev"
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
},
"time": "2012-12-30 23:41:22",
"time": "2013-03-03 17:14:30",
"bin": [
"bin/doctrine",
"bin/doctrine.php"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "2.4.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Dflydev\\Cilex\\Provider\\DoctrineOrm": "src",
"Dflydev\\Pimple\\Provider\\DoctrineOrm": "src",
"Dflydev\\Silex\\Provider\\DoctrineOrm": "src"
"Doctrine\\ORM\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -2154,23 +2101,29 @@
],
"authors": [
{
"name": "Dragonfly Development Inc.",
"email": "info@dflydev.com",
"homepage": "http://dflydev.com"
"name": "Jonathan Wage",
"email": "jonwage@gmail.com",
"homepage": "http://www.jwage.com/"
},
{
"name": "Beau Simensen",
"email": "beau@dflydev.com",
"homepage": "http://beausimensen.com"
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com",
"homepage": "http://www.instaclick.com"
},
{
"name": "Roman Borschel",
"email": "roman@code-factory.org"
},
{
"name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de"
}
],
"description": "Doctrine ORM Service Provider",
"description": "Object-Relational-Mapper for PHP",
"homepage": "http://www.doctrine-project.org",
"keywords": [
"cilex",
"doctrine",
"orm",
"pimple",
"silex"
"database",
"orm"
]
},
{
@ -2180,12 +2133,12 @@
"source": {
"type": "git",
"url": "https://github.com/l3pp4rd/DoctrineExtensions.git",
"reference": "0e19859e1f262f9a380cd399964610cf3f73dcfe"
"reference": "80eb92fb80b06425260cb5d3488d852caa38df1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/0e19859e1f262f9a380cd399964610cf3f73dcfe",
"reference": "0e19859e1f262f9a380cd399964610cf3f73dcfe",
"url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/80eb92fb80b06425260cb5d3488d852caa38df1f",
"reference": "80eb92fb80b06425260cb5d3488d852caa38df1f",
"shasum": ""
},
"require": {
@ -2205,7 +2158,7 @@
"doctrine/mongodb-odm": ">=1.0.0-BETA7",
"doctrine/orm": ">=2.3.2"
},
"time": "2013-03-01 15:53:01",
"time": "2013-03-04 13:45:49",
"type": "library",
"extra": {
"branch-alias": {
@ -2253,5 +2206,52 @@
"tree",
"uploadable"
]
},
{
"name": "fzaninotto/faker",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
"reference": "843e60b04f923402b8a9d78c7ae742e09b581b1b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/843e60b04f923402b8a9d78c7ae742e09b581b1b",
"reference": "843e60b04f923402b8a9d78c7ae742e09b581b1b",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2013-03-04 14:55:49",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
"Faker": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "François Zaninotto"
}
],
"description": "Faker is a PHP library that generates fake data for you.",
"keywords": [
"data",
"faker",
"fixtures"
]
}
]

@ -23,7 +23,7 @@ use Doctrine\Common\Persistence\Mapping\ClassMetadata;
use Doctrine\Common\Proxy\AbstractProxyFactory;
use Doctrine\Common\Proxy\ProxyDefinition;
use Doctrine\Common\Util\ClassUtils;
use Doctrine\Common\Proxy\Proxy;
use Doctrine\Common\Proxy\Proxy as BaseProxy;
use Doctrine\Common\Proxy\ProxyGenerator;
use Doctrine\ORM\ORMInvalidArgumentException;
use Doctrine\ORM\Persisters\BasicEntityPersister;
@ -116,7 +116,7 @@ class ProxyFactory extends AbstractProxyFactory
private function createInitializer(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister)
{
if ($classMetadata->getReflectionClass()->hasMethod('__wakeup')) {
return function (Proxy $proxy) use ($entityPersister, $classMetadata) {
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
$proxy->__setInitializer(null);
$proxy->__setCloner(null);
@ -141,7 +141,7 @@ class ProxyFactory extends AbstractProxyFactory
};
}
return function (Proxy $proxy) use ($entityPersister, $classMetadata) {
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
$proxy->__setInitializer(null);
$proxy->__setCloner(null);
@ -177,7 +177,7 @@ class ProxyFactory extends AbstractProxyFactory
*/
private function createCloner(ClassMetadata $classMetadata, BasicEntityPersister $entityPersister)
{
return function (Proxy $proxy) use ($entityPersister, $classMetadata) {
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
if ($proxy->__isInitialized()) {
return;
}

@ -160,6 +160,7 @@ Each of the generator properties (like `name`, `address`, and `lorem`) are calle
randomDigit // 7
randomDigitNotNull // 5
randomNumber($nbDigits = NULL) // 79907610
randomNumber($from, $to) // 39049
randomFloat($nbMaxDecimals = NULL, $min = 0, $max = NULL) // 48.8932
randomLetter // 'b'
randomElement($array = array ('a','b','c')) // 'b'

@ -1013,6 +1013,63 @@ class Category
```
### MongoDB example (Yaml)
YourNamespace\Document\Category:
type: mappedSuperclass
repositoryClass: Gedmo\Tree\Document\MongoDB\Repository\MaterializedPathRepository
collection: categories
gedmo:
tree:
type: materializedPath
activateLocking: true
fields:
id:
id: true
title:
type: string
gedmo:
- sluggable
slug:
type: string
gedmo:
0: treePathSource
slug:
unique: false
fields:
- title
path:
type: string
gedmo:
treePath:
separator: '/'
appendId: false
startsWithSeparator: false # default
endsWithSeparator: true # default
level:
type: int
name: lvl
nullable: true
gedmo:
- treeLevel
lockTime:
type: date
gedmo:
- treeLockTime
hash:
type: string
gedmo:
- treePathHash
parent:
reference: true
type: one
inversedBy: children
targetDocument: YourNamespace\Document\Category
simple: true
gedmo:
- treeParent
### Path generation
When an entity is inserted, a path is generated using the value of the field configured as the TreePathSource.

@ -27,6 +27,7 @@ class Validator
'date',
'time',
'datetime',
'datetimetz',
'timestamp',
'zenddate'
);

@ -34,6 +34,7 @@ class Annotation extends AbstractAnnotationDriver
'date',
'time',
'datetime',
'datetimetz',
'timestamp',
'zenddate',
'vardatetime',

@ -30,6 +30,7 @@ class Xml extends BaseXml
'date',
'time',
'datetime',
'datetimetz',
'timestamp',
'zenddate',
'vardatetime',

@ -35,6 +35,7 @@ class Yaml extends File implements Driver
'date',
'time',
'datetime',
'datetimetz',
'timestamp',
'zenddate',
'vardatetime',

@ -111,13 +111,40 @@ class Yaml extends File implements Driver
if (strlen($separator) > 1) {
throw new InvalidMappingException("Tree Path field - [{$field}] Separator {$separator} is invalid. It must be only one character long.");
}
if (is_array($treePathInfo) && isset($treePathInfo['appendId'])) {
$appendId = $treePathInfo['appendId'];
} else {
$appendId = null;
}
if (is_array($treePathInfo) && isset($treePathInfo['startsWithSeparator'])) {
$startsWithSeparator = $treePathInfo['startsWithSeparator'];
} else {
$startsWithSeparator = false;
}
if (is_array($treePathInfo) && isset($treePathInfo['endsWithSeparator'])) {
$endsWithSeparator = $treePathInfo['endsWithSeparator'];
} else {
$endsWithSeparator = true;
}
$config['path'] = $field;
$config['path_separator'] = $separator;
$config['path_append_id'] = $appendId;
$config['path_starts_with_separator'] = $startsWithSeparator;
$config['path_ends_with_separator'] = $endsWithSeparator;
} elseif (in_array('treePathSource', $fieldMapping['gedmo'])) {
if (!$validator->isValidFieldForPathSource($meta, $field)) {
throw new InvalidMappingException("Tree PathSource field - [{$field}] type is not valid. It can be any of the integer variants, double, float or string in class - {$meta->name}");
}
$config['path_source'] = $field;
} elseif (in_array('treePathHash', $fieldMapping['gedmo'])) {
if (!$validator->isValidFieldForPathSource($meta, $field)) {
throw new InvalidMappingException("Tree PathHash field - [{$field}] type is not valid and must be 'string' in class - {$meta->name}");
}
$config['path_hash'] = $field;
} elseif (in_array('treeLockTime', $fieldMapping['gedmo'])) {
if (!$validator->isValidFieldForLocktime($meta, $field)) {
throw new InvalidMappingException("Tree LockTime field - [{$field}] type is not valid. It must be \"date\" in class - {$meta->name}");

@ -62,7 +62,7 @@ class Validator
* @var array
*/
private $validPathHashTypes = array(
'string'
'string'
);
/**
@ -78,8 +78,6 @@ class Validator
'string'
);
/**
* Checks if $field type is valid
*

@ -287,11 +287,10 @@ abstract class AbstractMaterializedPath implements Strategy
$parentPath = $pathProp->getValue($parent);
// if parent path not ends with separator
if($parentPath[strlen($parentPath) - 1] !== $config['path_separator']){
// add separator
$path = $pathProp->getValue($parent) . $config['path_separator'] . $path;
}
else {
if ($parentPath[strlen($parentPath) - 1] !== $config['path_separator']) {
// add separator
$path = $pathProp->getValue($parent) . $config['path_separator'] . $path;
} else {
// don't add separator
$path = $pathProp->getValue($parent) . $path;
}
@ -299,11 +298,11 @@ abstract class AbstractMaterializedPath implements Strategy
}
if($config['path_starts_with_separator'] && (strlen($path) > 0 && $path[0] !== $config['path_separator'])){
if ($config['path_starts_with_separator'] && (strlen($path) > 0 && $path[0] !== $config['path_separator'])) {
$path = $config['path_separator'] . $path;
}
if($config['path_ends_with_separator'] && ($path[strlen($path) - 1] !== $config['path_separator'])) {
if ($config['path_ends_with_separator'] && ($path[strlen($path) - 1] !== $config['path_separator'])) {
$path .= $config['path_separator'];
}
@ -312,7 +311,7 @@ abstract class AbstractMaterializedPath implements Strategy
$config['path'] => array(null, $path)
);
if(isset($config['path_hash'])){
if (isset($config['path_hash'])) {
$pathHash = md5($path);
$pathHashProp = $meta->getReflectionProperty($config['path_hash']);
$pathHashProp->setAccessible(true);

@ -21,7 +21,7 @@ class FilenameGeneratorAlphanumeric implements FilenameGeneratorInterface
/**
* @inheritDoc
*/
public static function generate($filename, $extension)
public static function generate($filename, $extension, $object = null)
{
return preg_replace('/[^a-z0-9]+/', '-', strtolower($filename)).$extension;
}

@ -20,8 +20,9 @@ interface FilenameGeneratorInterface
*
* @param string - Filename without extension
* @param string - Extension with dot: .jpg, .gif, etc
* @param $object
*
* @return string
*/
public static function generate($filename, $extension);
public static function generate($filename, $extension, $object = null);
}

@ -18,7 +18,7 @@ class FilenameGeneratorSha1 implements FilenameGeneratorInterface
/**
* @inheritDoc
*/
public static function generate($filename, $extension)
public static function generate($filename, $extension, $object = null)
{
return sha1(uniqid($filename.$extension, true)).$extension;
}

@ -338,7 +338,7 @@ class UploadableListener extends MappedEventSubscriber
$generatorClass = $config['filenameGenerator'];
}
$info = $this->moveFile($fileInfo, $path, $generatorClass, $config['allowOverwrite'], $config['appendNumber']);
$info = $this->moveFile($fileInfo, $path, $generatorClass, $config['allowOverwrite'], $config['appendNumber'], $object);
// We override the mime type with the guessed one
$info['fileMimeType'] = $mime;
@ -428,6 +428,7 @@ class UploadableListener extends MappedEventSubscriber
* @param bool $filenameGeneratorClass
* @param bool $overwrite
* @param bool $appendNumber
* @param $object
* @return array
* @throws \Gedmo\Exception\UploadableUploadException
* @throws \Gedmo\Exception\UploadableNoFileException
@ -439,7 +440,7 @@ class UploadableListener extends MappedEventSubscriber
* @throws \Gedmo\Exception\UploadableNoTmpDirException
* @throws \Gedmo\Exception\UploadableCantWriteException
*/
public function moveFile(FileInfoInterface $fileInfo, $path, $filenameGeneratorClass = false, $overwrite = false, $appendNumber = false)
public function moveFile(FileInfoInterface $fileInfo, $path, $filenameGeneratorClass = false, $overwrite = false, $appendNumber = false, $object)
{
if ($fileInfo->getError() > 0) {
switch ($fileInfo->getError()) {
@ -503,7 +504,8 @@ class UploadableListener extends MappedEventSubscriber
if ($filenameGeneratorClass) {
$filename = $filenameGeneratorClass::generate(
str_replace($path.'/', '', $info['fileWithoutExt']),
$info['fileExtension']
$info['fileExtension'],
$object
);
$info['filePath'] = str_replace(
'/'.$info['fileName'],

@ -24,4 +24,4 @@ class FilenameGeneratorAlphanumericTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('meganame-for-a-file-.exe', $generator->generate($filename, $extension));
}
}
}

@ -691,8 +691,8 @@ class FakeFileInfo
class FakeFilenameGenerator implements \Gedmo\Uploadable\FilenameGenerator\FilenameGeneratorInterface
{
public static function generate($filename, $extension)
public static function generate($filename, $extension, $object = null)
{
return '123.txt';
}
}
}

Loading…
Cancel
Save