hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #294 from romainneutron/composer

Browse Source 
Update composer.json
This commit is contained in:
Romain Neutron
2013-02-01 07:13:00 -08:00
parent 17a58030fb 6143e71e7f
commit da5a2e9d87
7 changed files with 326 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
composer.json
View File

@@ -1,67 +1,65 @@
{ {
"name": "phraseanet/phraseanet", "name" : "phraseanet/phraseanet",
"description": "Phraseanet", "description" : "Phraseanet",
"license" : "GPL-3.0",
"config": { "config": {
"bin-dir": "bin/" "bin-dir" : "bin/"
}, },
"require": { "require": {
"php": ">=5.3.3", "php" : ">=5.3.3",
"alchemy/oauth2php": "master", "alchemy/oauth2php" : "dev-master",
"alchemy/phlickr": "master", "alchemy/phlickr" : "dev-master",
"dailymotion/sdk": "*", "badfaith/badfaith" : "dev-master",
"data-uri/data-uri": "dev-master", "dailymotion/sdk" : "dev-master",
"doctrine/orm": "2.2.2", "data-uri/data-uri" : "dev-master",
"gedmo/doctrine-extensions": "2.2.*", "doctrine/orm" : "~2.3.0",
"grom/silex-service-provider": "dev-master", "gedmo/doctrine-extensions" : "~2.3.0",
"mediavorus/mediavorus": "0.2.x-dev", "grom/silex-service-provider" : "dev-master",
"media-alchemyst/media-alchemyst": "0.2.x-dev", "knplabs/knp-snappy" : "dev-master",
"monolog/monolog": "1.0.*", "mediavorus/mediavorus" : "~0.3.0",
"neutron/silex-badfaith-provider": "dev-master", "media-alchemyst/media-alchemyst" : "~0.2.0",
"monolog/monolog" : "~1.3.0",
"neutron/silex-badfaith-provider" : "dev-master",
"neutron/silex-filesystem-provider": "dev-master", "neutron/silex-filesystem-provider": "dev-master",
"neutron/sphinxsearch-api": ">=2.0.6", "neutron/sphinxsearch-api" : "~2.0.6",
"php-xpdf/php-xpdf": "dev-master", "php-xpdf/php-xpdf" : "~0.1.1",
"phpexiftool/phpexiftool": "dev-master", "phpexiftool/phpexiftool" : "~0.1.0",
"silex/silex": "1.0.*", "phpexiftool/exiftool" : "dev-master",
"swiftmailer/swiftmailer": "4.1.*", "silex/silex" : "1.0.x-dev@dev",
"symfony/symfony": ">=2.1", "swiftmailer/swiftmailer" : "~4.3.0",
"tecnick.com/tcpdf": "dev-master", "symfony/symfony" : "~2.1.7",
"twig/twig": ">=1.9", "tecnick.com/tcpdf" : "dev-master",
"twig/extensions": "master", "twig/twig" : "~1.12",
"zend/gdata": ">1.11" "twig/extensions" : "1.0.x-dev@dev",
"zend/gdata" : "~1.12.1"
}, },
"minimum-stability": "dev",
"require-dev": { "require-dev": {
"doctrine/data-fixtures": "dev-master", "doctrine/data-fixtures" : "dev-master"
"fabpot/php-cs-fixer": "dev-master"
}, },
"repositories": [ "repositories": [
{ {
"type": "git", "type" : "git",
"url": "https://github.com/winmillwill/BadFaith" "url" : "https://github.com/winmillwill/BadFaith"
}, },
{ {
"type": "git", "type" : "git",
"url": "https://github.com/alchemy-fr/oauth2-php" "url" : "https://github.com/alchemy-fr/oauth2-php"
}, },
{ {
"type": "git", "type" : "git",
"url": "https://github.com/alchemy-fr/Phlickr" "url" : "https://github.com/alchemy-fr/Phlickr"
},
{
"type": "git",
"url": "https://github.com/alchemy-fr/PHPMailer_v5.1"
} }
], ],
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"": "lib/classes", "" : "lib/classes",
"Alchemy": "lib", "Alchemy" : "lib",
"Doctrine": "lib", "Doctrine" : "lib",
"Entities": "lib/Doctrine", "Entities" : "lib/Doctrine",
"Types": "lib/Doctrine", "Types" : "lib/Doctrine",
"Repositories": "lib/Doctrine", "Repositories" : "lib/Doctrine",
"Proxies": "lib/Doctrine", "Proxies" : "lib/Doctrine",
"PhraseaFixture": "lib/conf.d" "PhraseaFixture" : "lib/conf.d"
} }
}, },
"include-path": ["vendor/zend/gdata/library"] "include-path": ["vendor/zend/gdata/library"]

508
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
lib/Doctrine/Proxies/__CG__EntitiesBasket.php
View File

@@ -228,7 +228,7 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
if ($original === null) { if ($original === null) {
throw new \Doctrine\ORM\EntityNotFoundException(); throw new \Doctrine\ORM\EntityNotFoundException();
} }
foreach ($class->reflFields AS $field => $reflProperty) { foreach ($class->reflFields as $field => $reflProperty) {
$reflProperty->setValue($this, $reflProperty->getValue($original)); $reflProperty->setValue($this, $reflProperty->getValue($original));
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);

2
lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php
View File

@@ -126,7 +126,7 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P
if ($original === null) { if ($original === null) {
throw new \Doctrine\ORM\EntityNotFoundException(); throw new \Doctrine\ORM\EntityNotFoundException();
} }
foreach ($class->reflFields AS $field => $reflProperty) { foreach ($class->reflFields as $field => $reflProperty) {
$reflProperty->setValue($this, $reflProperty->getValue($original)); $reflProperty->setValue($this, $reflProperty->getValue($original));
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);

2
lib/Doctrine/Proxies/__CG__EntitiesUsrList.php
View File

@@ -144,7 +144,7 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
if ($original === null) { if ($original === null) {
throw new \Doctrine\ORM\EntityNotFoundException(); throw new \Doctrine\ORM\EntityNotFoundException();
} }
foreach ($class->reflFields AS $field => $reflProperty) { foreach ($class->reflFields as $field => $reflProperty) {
$reflProperty->setValue($this, $reflProperty->getValue($original)); $reflProperty->setValue($this, $reflProperty->getValue($original));
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);

2
lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php
View File

@@ -138,7 +138,7 @@ class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy
if ($original === null) { if ($original === null) {
throw new \Doctrine\ORM\EntityNotFoundException(); throw new \Doctrine\ORM\EntityNotFoundException();
} }
foreach ($class->reflFields AS $field => $reflProperty) { foreach ($class->reflFields as $field => $reflProperty) {
$reflProperty->setValue($this, $reflProperty->getValue($original)); $reflProperty->setValue($this, $reflProperty->getValue($original));
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);

9
tests/classes/PhraseanetPHPUnitAbstract.php
View File

@@ -500,15 +500,6 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
$loader->addFixture($validationSession); $loader->addFixture($validationSession);
$this->insertFixtureInDatabase($loader); $this->insertFixtureInDatabase($loader);
//add current user as participant
$validationParticipant = new PhraseaFixture\ValidationParticipant\LoadParticipantWithSession();
$validationParticipant->setSession($validationSession->validationSession);
$validationParticipant->setUser($currentUser);
$loader = new Loader();
$loader->addFixture($validationParticipant);
$this->insertFixtureInDatabase($loader);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->fail('Fail load one WorkingZone : ' . $e->getMessage()); $this->fail('Fail load one WorkingZone : ' . $e->getMessage());
} }