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

Fix CS

Browse Source
This commit is contained in:
Romain Neutron
2012-05-23 00:01:29 +02:00
parent 41e56ed86b
commit 4afa21d419
346 changed files with 2234 additions and 3759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Application/Api.php
View File

@@ -789,6 +789,7 @@ return call_user_func(function() {
$code = \API_V1_result::ERROR_INTERNALSERVERERROR; $code = \API_V1_result::ERROR_INTERNALSERVERERROR;
$result = $app['api']->get_error_message($app['request'], $code, $e->getMessage()); $result = $app['api']->get_error_message($app['request'], $code, $e->getMessage());
return $result->get_response(); return $result->get_response();
}); });
//// ////

2
lib/Alchemy/Phrasea/Application/ApiVersion.php
View File

@@ -11,9 +11,7 @@
namespace Alchemy\Phrasea\Application; namespace Alchemy\Phrasea\Application;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception;
/** /**
* *

2
lib/Alchemy/Phrasea/Application/Lightbox.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Application;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Controller\Exception as ControllerException; use Alchemy\Phrasea\Controller\Exception as ControllerException;
/** /**

3
lib/Alchemy/Phrasea/Application/Overview.php
View File

@@ -11,10 +11,7 @@
namespace Alchemy\Phrasea\Application; namespace Alchemy\Phrasea\Application;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* *

3
lib/Alchemy/Phrasea/Application/Root.php
View File

@@ -11,10 +11,7 @@
namespace Alchemy\Phrasea\Application; namespace Alchemy\Phrasea\Application;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Controller\Root as Controller; use Alchemy\Phrasea\Controller\Root as Controller;
/** /**

1
lib/Alchemy/Phrasea/Application/Setup.php
View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Application; namespace Alchemy\Phrasea\Application;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use Alchemy\Phrasea\Controller\Setup as Controller; use Alchemy\Phrasea\Controller\Setup as Controller;
use Alchemy\Phrasea\Controller\Utils as ControllerUtils; use Alchemy\Phrasea\Controller\Utils as ControllerUtils;

2
lib/Alchemy/Phrasea/Border/Attribute/Attribute.php
View File

@@ -43,7 +43,7 @@ interface Attribute
/** /**
* Build the current object with is string value * Build the current object with is string value
* *
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public static function loadFromString($string); public static function loadFromString($string);
} }

8
lib/Alchemy/Phrasea/Border/Attribute/Factory.php
View File

@@ -21,12 +21,12 @@ class Factory
/** /**
* Build a file package Attribute * Build a file package Attribute
* *
* @param string $name The name of the attribute, one of the * @param string $name The name of the attribute, one of the
* Attribute::NAME_* constants * Attribute::NAME_* constants
* @param string $serialized The serialized value of the attribute * @param string $serialized The serialized value of the attribute
* (Attribute::asString result) * (Attribute::asString result)
* @return Attribute The attribute * @return Attribute The attribute
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public static function getFileAttribute($name, $serialized) public static function getFileAttribute($name, $serialized)
{ {

6
lib/Alchemy/Phrasea/Border/Attribute/MetaField.php
View File

@@ -34,10 +34,10 @@ class MetaField implements Attribute
/** /**
* Constructor * Constructor
* *
* @param \databox_field $databox_field The databox field * @param \databox_field $databox_field The databox field
* @param type $value A scalar value * @param type $value A scalar value
* *
* @throws \InvalidArgumentException When value is not scalar * @throws \InvalidArgumentException When value is not scalar
*/ */
public function __construct(\databox_field $databox_field, $value) public function __construct(\databox_field $databox_field, $value)
{ {

2
lib/Alchemy/Phrasea/Border/Attribute/Metadata.php
View File

@@ -26,7 +26,7 @@ class Metadata implements Attribute
/** /**
* Constructor * Constructor
* *
* @param ExiftoolMeta $metadata The metadata * @param ExiftoolMeta $metadata The metadata
*/ */
public function __construct(ExiftoolMeta $metadata) public function __construct(ExiftoolMeta $metadata)
{ {

4
lib/Alchemy/Phrasea/Border/Attribute/Story.php
View File

@@ -24,7 +24,7 @@ class Story implements Attribute
/** /**
* Constructor * Constructor
* *
* @param \record_adapter $story The destination story * @param \record_adapter $story The destination story
*/ */
public function __construct(\record_adapter $story) public function __construct(\record_adapter $story)
{ {
@@ -54,7 +54,7 @@ class Story implements Attribute
/** /**
* {@inheritdoc} * {@inheritdoc}
* *
* @return \record_adapter The story * @return \record_adapter The story
*/ */
public function getValue() public function getValue()
{ {

6
lib/Alchemy/Phrasea/Border/Checker/Checker.php
View File

@@ -23,9 +23,9 @@ interface Checker
/** /**
* Checks constraints on the file * Checks constraints on the file
* *
* @param EntityManager $em The entity manager * @param EntityManager $em The entity manager
* @param File $file The file package object * @param File $file The file package object
* @return Response A Response object * @return Response A Response object
*/ */
public function check(EntityManager $em, File $file); public function check(EntityManager $em, File $file);

2
lib/Alchemy/Phrasea/Border/Checker/Filename.php
View File

@@ -24,7 +24,7 @@ class Filename implements Checker
/** /**
* Constructor * Constructor
* *
* @param boolean $sensitive Toggle case-sensitive mode, default : false * @param boolean $sensitive Toggle case-sensitive mode, default : false
*/ */
public function __construct($sensitive = false) public function __construct($sensitive = false)
{ {

4
lib/Alchemy/Phrasea/Border/Checker/Response.php
View File

@@ -22,8 +22,8 @@ class Response
/** /**
* Constructor * Constructor
* *
* @param boolean $ok True if the response is OK * @param boolean $ok True if the response is OK
* @param Checker $checker The checker attachedto the response * @param Checker $checker The checker attachedto the response
*/ */
public function __construct($ok, Checker $checker) public function __construct($ok, Checker $checker)
{ {

22
lib/Alchemy/Phrasea/Border/File.php
View File

@@ -46,9 +46,9 @@ class File
/** /**
* Constructor * Constructor
* *
* @param Media $media The media * @param Media $media The media
* @param \collection $collection The destination collection * @param \collection $collection The destination collection
* @param string $originalName The original name of the file * @param string $originalName The original name of the file
* (if not provided, original name is * (if not provided, original name is
* extracted from the pathfile) * extracted from the pathfile)
*/ */
@@ -77,9 +77,9 @@ class File
* @todo Check if an UUID is contained in the attributes, replace It if * @todo Check if an UUID is contained in the attributes, replace It if
* necessary * necessary
* *
* @param boolean $generate if true, if no uuid found, a valid one is generated * @param boolean $generate if true, if no uuid found, a valid one is generated
* @param boolean $write if true, writes uuid in all available metadatas * @param boolean $write if true, writes uuid in all available metadatas
* @return File * @return File
*/ */
public function getUUID($generate = false, $write = false) public function getUUID($generate = false, $write = false)
{ {
@@ -253,8 +253,8 @@ class File
/** /**
* Adds an attribute to the file package * Adds an attribute to the file package
* *
* @param Attribute\Attribute $attribute The attribute * @param Attribute\Attribute $attribute The attribute
* @return File * @return File
*/ */
public function addAttribute(Attribute\Attribute $attribute) public function addAttribute(Attribute\Attribute $attribute)
{ {
@@ -266,9 +266,9 @@ class File
/** /**
* Build the File package object * Build the File package object
* *
* @param string $pathfile The path to the file * @param string $pathfile The path to the file
* @param \collection $collection The destination collection * @param \collection $collection The destination collection
* @param string $originalName An optionnal original name (if * @param string $originalName An optionnal original name (if
* different from the $pathfile filename) * different from the $pathfile filename)
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* *

48
lib/Alchemy/Phrasea/Border/Manager.php
View File

@@ -42,7 +42,7 @@ class Manager
/** /**
* Constructor * Constructor
* *
* @param \Doctrine\ORM\EntityManager $em Entity manager * @param \Doctrine\ORM\EntityManager $em Entity manager
*/ */
public function __construct(EntityManager $em) public function __construct(EntityManager $em)
{ {
@@ -62,14 +62,14 @@ class Manager
/** /**
* Add a file to Phraseanet after having checked it * Add a file to Phraseanet after having checked it
* *
* @param LazaretSession $session The current Lazaret Session * @param LazaretSession $session The current Lazaret Session
* @param File $file A File package object * @param File $file A File package object
* @param type $callable A callback to execute after process * @param type $callable A callback to execute after process
* (arguments are $element (LazaretFile or \record_adapter), * (arguments are $element (LazaretFile or \record_adapter),
* $visa (Visa) * $visa (Visa)
* and $code (self::RECORD_CREATED or self::LAZARET_CREATED)) * and $code (self::RECORD_CREATED or self::LAZARET_CREATED))
* @param type $forceBehavior Force a behavior, one of the self::FORCE_* constant * @param type $forceBehavior Force a behavior, one of the self::FORCE_* constant
* @return int One of the self::RECORD_CREATED or self::LAZARET_CREATED constants * @return int One of the self::RECORD_CREATED or self::LAZARET_CREATED constants
*/ */
public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null) public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null)
{ {
@@ -106,8 +106,8 @@ class Manager
/** /**
* Check a File package object against the Checkers, and returns a Visa * Check a File package object against the Checkers, and returns a Visa
* *
* @param File $file A File package object * @param File $file A File package object
* @return Visa The Visa * @return Visa The Visa
*/ */
public function getVisa(File $file) public function getVisa(File $file)
{ {
@@ -123,8 +123,8 @@ class Manager
/** /**
* Registers a checker * Registers a checker
* *
* @param Checker\Checker $checker The checker to register * @param Checker\Checker $checker The checker to register
* @return Manager * @return Manager
*/ */
public function registerChecker(Checker\Checker $checker) public function registerChecker(Checker\Checker $checker)
{ {
@@ -136,8 +136,8 @@ class Manager
/** /**
* Registers an array of checkers * Registers an array of checkers
* *
* @param array $checkers Array of checkers * @param array $checkers Array of checkers
* @return Manager * @return Manager
*/ */
public function registerCheckers(array $checkers) public function registerCheckers(array $checkers)
{ {
@@ -151,8 +151,8 @@ class Manager
/** /**
* Unregister a checker * Unregister a checker
* *
* @param Checker\Checker $checker The checker to unregister * @param Checker\Checker $checker The checker to unregister
* @return Manager * @return Manager
*/ */
public function unregisterChecker(Checker\Checker $checker) public function unregisterChecker(Checker\Checker $checker)
{ {
@@ -181,8 +181,8 @@ class Manager
/** /**
* Find an available Lazaret filename and creates the empty file. * Find an available Lazaret filename and creates the empty file.
* *
* @param string $filename The desired filename * @param string $filename The desired filename
* @return string The available filename to use * @return string The available filename to use
*/ */
protected function bookLazaretPathfile($filename) protected function bookLazaretPathfile($filename)
{ {
@@ -205,8 +205,8 @@ class Manager
/** /**
* Adds a record to Phraseanet * Adds a record to Phraseanet
* *
* @param File $file The package file * @param File $file The package file
* @return \record_adater * @return \record_adater
*/ */
protected function createRecord(File $file) protected function createRecord(File $file)
{ {
@@ -373,10 +373,10 @@ class Manager
/** /**
* Send a package file to lazaret * Send a package file to lazaret
* *
* @param File $file The package file * @param File $file The package file
* @param Visa $visa The visa related to the package file * @param Visa $visa The visa related to the package file
* @param LazaretSession $session The current LazaretSession * @param LazaretSession $session The current LazaretSession
* @param Boolean $forced True if the file has been forced to quarantine * @param Boolean $forced True if the file has been forced to quarantine
* @return \Entities\LazaretFile * @return \Entities\LazaretFile
*/ */
protected function createLazaret(File $file, Visa $visa, LazaretSession $session, $forced) protected function createLazaret(File $file, Visa $visa, LazaretSession $session, $forced)
@@ -440,8 +440,8 @@ class Manager
* Add technical Metadata attribute to a package file by reference to add it * Add technical Metadata attribute to a package file by reference to add it
* to Phraseanet * to Phraseanet
* *
* @param File $file The file * @param File $file The file
* @return \Doctrine\ORM\EntityManager * @return \Doctrine\ORM\EntityManager
*/ */
protected function addMediaAttributes(File &$file) protected function addMediaAttributes(File &$file)
{ {

6
lib/Alchemy/Phrasea/Border/Visa.php
View File

@@ -46,8 +46,8 @@ class Visa
/** /**
* Add a checker Response to the visa * Add a checker Response to the visa
* *
* @param Checker\Response $response A Checker Response * @param Checker\Response $response A Checker Response
* @return Visa * @return Visa
*/ */
public function addResponse(Checker\Response $response) public function addResponse(Checker\Response $response)
{ {
@@ -59,7 +59,7 @@ class Visa
/** /**
* Get all the responses generated by the Checkers * Get all the responses generated by the Checkers
* *
* @return array An array of Checker\Response * @return array An array of Checker\Response
*/ */
public function getResponses() public function getResponses()
{ {

4
lib/Alchemy/Phrasea/Cache/Cache.php
View File

@@ -35,7 +35,7 @@ interface Cache extends DoctrineCache
/** /**
* Get an entry from the cache. * Get an entry from the cache.
* *
* @param string $key cache id The id of the cache entry to fetch. * @param string $key cache id The id of the cache entry to fetch.
* @return string The cached data. * @return string The cached data.
* @return FALSE, if no cache entry exists for the given id. * @return FALSE, if no cache entry exists for the given id.
* @ throws Alchemy\Phrasea\Cache\Exception if provided key does not exist * @ throws Alchemy\Phrasea\Cache\Exception if provided key does not exist
@@ -45,7 +45,7 @@ interface Cache extends DoctrineCache
/** /**
* Delete multi cache entries * Delete multi cache entries
* *
* @param array $keys contains all keys to delete * @param array $keys contains all keys to delete
* @return Alchemy\Phrasea\Cache\Cache * @return Alchemy\Phrasea\Cache\Cache
*/ */
public function deleteMulti(array $keys); public function deleteMulti(array $keys);

2
lib/Alchemy/Phrasea/Controller/Admin/Description.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;

2
lib/Alchemy/Phrasea/Controller/Admin/Fields.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

2
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

2
lib/Alchemy/Phrasea/Controller/Admin/Root.php
View File

@@ -18,8 +18,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
*/ */
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

2
lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;

2
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -14,8 +14,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

2
lib/Alchemy/Phrasea/Controller/Prod/Bridge.php
View File

@@ -16,8 +16,6 @@ use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Helper\Record as RecordHelper; use Alchemy\Phrasea\Helper\Record as RecordHelper;
/** /**

2
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
View File

@@ -16,8 +16,6 @@ use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Helper\Record as RecordHelper; use Alchemy\Phrasea\Helper\Record as RecordHelper;
/** /**

4
lib/Alchemy/Phrasea/Controller/Prod/Language.php
View File

@@ -14,11 +14,7 @@ namespace Alchemy\Phrasea\Controller\Prod;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Helper\Record as RecordHelper;
/** /**
* *

45
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Controller\Prod; namespace Alchemy\Phrasea\Controller\Prod;
use Alchemy\Phrasea\Helper;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
@@ -32,8 +31,8 @@ class Lazaret implements ControllerProviderInterface
/** /**
* Connect the ControllerCollection to the Silex Application * Connect the ControllerCollection to the Silex Application
* *
* @param Application $app A silex application * @param Application $app A silex application
* @return \Silex\ControllerCollection * @return \Silex\ControllerCollection
*/ */
public function connect(Application $app) public function connect(Application $app)
{ {
@@ -146,8 +145,8 @@ class Lazaret implements ControllerProviderInterface
/** /**
* List all elements in lazaret * List all elements in lazaret
* *
* @param Application $app A Silex application * @param Application $app A Silex application
* @param Request $request The current request * @param Request $request The current request
* *
* @return Response * @return Response
*/ */
@@ -172,23 +171,23 @@ class Lazaret implements ControllerProviderInterface
/** /**
* Get one lazaret Element * Get one lazaret Element
* *
* @param Application $app A Silex application * @param Application $app A Silex application
* @param Request $request The current request * @param Request $request The current request
* @param int $file_id A lazaret element id * @param int $file_id A lazaret element id
* *
* @return Response * @return Response
*/ */
public function getElement(Application $app, Request $request, $file_id) public function getElement(Application $app, Request $request, $file_id)
{ {
} }
/** /**
* Add an element to phraseanet * Add an element to phraseanet
* *
* @param Application $app A Silex application * @param Application $app A Silex application
* @param Request $request The current request * @param Request $request The current request
* @param int $file_id A lazaret element id * @param int $file_id A lazaret element id
* *
* @return Response * @return Response
*/ */
@@ -200,9 +199,9 @@ class Lazaret implements ControllerProviderInterface
/** /**
* Delete a lazaret element * Delete a lazaret element
* *
* @param Application $app A Silex application where the controller is mounted on * @param Application $app A Silex application where the controller is mounted on
* @param Request $request The current request * @param Request $request The current request
* @param int $file_id A lazaret element id * @param int $file_id A lazaret element id
* *
* @return Response * @return Response
*/ */
@@ -214,9 +213,9 @@ class Lazaret implements ControllerProviderInterface
/** /**
* Substitute a record element by a lazaret element * Substitute a record element by a lazaret element
* *
* @param Application $app A Silex application where the controller is mounted on * @param Application $app A Silex application where the controller is mounted on
* @param Request $request The current request * @param Request $request The current request
* @param int $file_id A lazaret element id * @param int $file_id A lazaret element id
* *
* @return Response * @return Response
*/ */
@@ -228,9 +227,9 @@ class Lazaret implements ControllerProviderInterface
/** /**
* Get the associated lazaret element thumbnail * Get the associated lazaret element thumbnail
* *
* @param Application $app A Silex application where the controller is mounted on * @param Application $app A Silex application where the controller is mounted on
* @param Request $request The current request * @param Request $request The current request
* @param int $file_id A lazaret element id * @param int $file_id A lazaret element id
* *
* @return Response * @return Response
*/ */
@@ -242,8 +241,8 @@ class Lazaret implements ControllerProviderInterface
/** /**
* Prefix the method to call with the controller class name * Prefix the method to call with the controller class name
* *
* @param string $method The method to call * @param string $method The method to call
* @return string * @return string
*/ */
private function call($method) private function call($method)
{ {

1
lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php
View File

@@ -15,7 +15,6 @@ use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Alchemy\Phrasea\Helper\Record as RecordHelper; use Alchemy\Phrasea\Helper\Record as RecordHelper;
/** /**

6
lib/Alchemy/Phrasea/Controller/Prod/Query.php
View File

@@ -120,8 +120,7 @@ class Query implements ControllerProviderInterface
} }
if ($npages > 4) if ($npages > 4)
$string .= "<a onclick='gotopage(" . ($npages) . ");return false;' class='btn btn-primary btn-mini'>&gt;&gt;</a>"; $string .= "<a onclick='gotopage(" . ($npages) . ");return false;' class='btn btn-primary btn-mini'>&gt;&gt;</a>";
} } else {
else {
$start = $npages - 4; $start = $npages - 4;
if (($start) > 0) if (($start) > 0)
$string .= "<a onclick='gotopage(1);return false;' class='btn btn-primary btn-mini'>&lt;&lt;</a>"; $string .= "<a onclick='gotopage(1);return false;' class='btn btn-primary btn-mini'>&lt;&lt;</a>";
@@ -134,8 +133,7 @@ class Query implements ControllerProviderInterface
$string .= "<a onclick='gotopage(" . $i . ");return false;' class='btn btn-primary btn-mini'>" . $i . "</a>"; $string .= "<a onclick='gotopage(" . $i . ");return false;' class='btn btn-primary btn-mini'>" . $i . "</a>";
} }
} }
} } else {
else {
$string .= "<a onclick='gotopage(1);return false;' class='btn btn-primary btn-mini'>&lt;&lt;</a>"; $string .= "<a onclick='gotopage(1);return false;' class='btn btn-primary btn-mini'>&lt;&lt;</a>";
for ($i = ($page - 2); $i <= ($page + 2); $i ++ ) { for ($i = ($page - 2); $i <= ($page + 2); $i ++ ) {

3
lib/Alchemy/Phrasea/Controller/Prod/TOU.php
View File

@@ -16,9 +16,6 @@ use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Helper\Record as RecordHelper;
/** /**
* *

4
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Controller\Prod; namespace Alchemy\Phrasea\Controller\Prod;
use Alchemy\Phrasea\RouteProcessor\Basket as BasketRoute;
use Alchemy\Phrasea\Helper; use Alchemy\Phrasea\Helper;
use DataURI; use DataURI;
use MediaVorus\MediaVorus; use MediaVorus\MediaVorus;
@@ -20,9 +19,6 @@ use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* *

3
lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
View File

@@ -16,9 +16,6 @@ use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Alchemy\Phrasea\Helper\Record as RecordHelper;
/** /**
* *

17
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Controller\Prod; namespace Alchemy\Phrasea\Controller\Prod;
use Alchemy\Phrasea\Border; use Alchemy\Phrasea\Border;
use Alchemy\Phrasea\Helper;
use MediaVorus\MediaVorus; use MediaVorus\MediaVorus;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
@@ -35,8 +34,8 @@ class Upload implements ControllerProviderInterface
/** /**
* Connect the ControllerCollection to the Silex Application * Connect the ControllerCollection to the Silex Application
* *
* @param Application $app A silex application * @param Application $app A silex application
* @return \Silex\ControllerCollection * @return \Silex\ControllerCollection
*/ */
public function connect(Application $app) public function connect(Application $app)
{ {
@@ -83,8 +82,8 @@ class Upload implements ControllerProviderInterface
/** /**
* Render the html upload form * Render the html upload form
* *
* @param Application $app A Silex application * @param Application $app A Silex application
* @param Request $request The current request * @param Request $request The current request
* *
* @return Response * @return Response
*/ */
@@ -115,8 +114,8 @@ class Upload implements ControllerProviderInterface
/** /**
* Upload processus * Upload processus
* *
* @param Application $app The Silex application * @param Application $app The Silex application
* @param Request $request The current request * @param Request $request The current request
* *
* @return Response * @return Response
*/ */
@@ -232,8 +231,8 @@ class Upload implements ControllerProviderInterface
/** /**
* Prefix the method to call with the controller class name * Prefix the method to call with the controller class name
* *
* @param string $method The method to call * @param string $method The method to call
* @return string * @return string
*/ */
private function call($method) private function call($method)
{ {

5
lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Root;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;
@@ -68,8 +66,7 @@ class RSSFeeds implements ControllerProviderInterface
$content->set_previous_page($feed->get_user_link($registry, $user, $format, ($page - 1))); $content->set_previous_page($feed->get_user_link($registry, $user, $format, ($page - 1)));
if ($total > ($page * $perPage)) if ($total > ($page * $perPage))
$content->set_next_page($feed->get_user_link($registry, $user, $format, ($page + 1))); $content->set_next_page($feed->get_user_link($registry, $user, $format, ($page + 1)));
} } else {
else {
if ($page > 1) if ($page > 1)
$content->set_previous_page($feed->get_homepage_link($registry, $format, ($page - 1))); $content->set_previous_page($feed->get_homepage_link($registry, $format, ($page - 1)));
if ($total > ($page * $perPage)) if ($total > ($page * $perPage))

2
lib/Alchemy/Phrasea/Controller/Setup/Installer.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Setup;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

3
lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php
View File

@@ -11,10 +11,7 @@
namespace Alchemy\Phrasea\Controller\Setup; namespace Alchemy\Phrasea\Controller\Setup;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

2
lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Utils;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

2
lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Utils;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Silex\Application; use Silex\Application;
use Silex\ControllerProviderInterface; use Silex\ControllerProviderInterface;
use Silex\ControllerCollection; use Silex\ControllerCollection;

10
lib/Alchemy/Phrasea/Core/Configuration.php
View File

@@ -37,8 +37,8 @@ class Configuration
/** /**
* *
* @param Configuration\ApplicationSpecification $specifications * @param Configuration\ApplicationSpecification $specifications
* @param type $environment * @param type $environment
* @return \Alchemy\Phrasea\Core\Configuration * @return \Alchemy\Phrasea\Core\Configuration
*/ */
public static function build($specifications = null, $environment = null) public static function build($specifications = null, $environment = null)
@@ -52,8 +52,8 @@ class Configuration
/** /**
* *
* @param Configuration\Specification $specifications * @param Configuration\Specification $specifications
* @param type $environment * @param type $environment
* @return \Alchemy\Phrasea\Core\Configuration * @return \Alchemy\Phrasea\Core\Configuration
*/ */
public function __construct(Configuration\Specification $specifications, $environment = null) public function __construct(Configuration\Specification $specifications, $environment = null)
@@ -336,7 +336,7 @@ class Configuration
/** /**
* Return the selected service configuration * Return the selected service configuration
* *
* @param type $name * @param type $name
* @return ParameterBag * @return ParameterBag
*/ */
public function getService($name) public function getService($name)

1
lib/Alchemy/Phrasea/Core/Service/Log/FirePHP.php
View File

@@ -16,7 +16,6 @@ use Alchemy\Phrasea\Core,
Alchemy\Phrasea\Core\Service\ServiceAbstract, Alchemy\Phrasea\Core\Service\ServiceAbstract,
Alchemy\Phrasea\Core\Service\ServiceInterface; Alchemy\Phrasea\Core\Service\ServiceInterface;
use Monolog\Logger; use Monolog\Logger;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\FirePHPHandler; use Monolog\Handler\FirePHPHandler;
/** /**

1
lib/Alchemy/Phrasea/Core/Service/Orm/Doctrine.php
View File

@@ -16,7 +16,6 @@ use Alchemy\Phrasea\Core,
Alchemy\Phrasea\Core\Service\ServiceAbstract, Alchemy\Phrasea\Core\Service\ServiceAbstract,
Alchemy\Phrasea\Core\Service\ServiceInterface; Alchemy\Phrasea\Core\Service\ServiceInterface;
use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Type;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
/** /**
* *

1
lib/Alchemy/Phrasea/Core/Service/ServiceAbstract.php
View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Core\Service; namespace Alchemy\Phrasea\Core\Service;
use Alchemy\Phrasea\Core; use Alchemy\Phrasea\Core;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
/** /**
* *

2
lib/Alchemy/Phrasea/Helper/Helper.php
View File

@@ -35,7 +35,7 @@ class Helper
/** /**
* *
* @param Kernel $kernel * @param Kernel $kernel
* @return Helper * @return Helper
*/ */
public function __construct(Core $core, Request $Request) public function __construct(Core $core, Request $Request)

2
lib/Alchemy/Phrasea/Helper/Prod.php
View File

@@ -11,8 +11,6 @@
namespace Alchemy\Phrasea\Helper; namespace Alchemy\Phrasea\Helper;
use Alchemy\Phrasea\Core;
use Symfony\Component\HttpFoundation\Request;
/** /**
* *

1
lib/Alchemy/Phrasea/Helper/Record/Bridge.php
View File

@@ -13,7 +13,6 @@ namespace Alchemy\Phrasea\Helper\Record;
use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper, use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper,
Alchemy\Phrasea\Core; Alchemy\Phrasea\Core;
use Symfony\Component\HttpFoundation\Request;
/** /**
* *

4
lib/Alchemy/Phrasea/Helper/Record/Edit.php
View File

@@ -77,7 +77,7 @@ class Edit extends RecordHelper
/** /**
* *
* @param \Alchemy\Phrasea\Core $core * @param \Alchemy\Phrasea\Core $core
* @return Edit * @return Edit
*/ */
public function __construct(Core $core, Request $Request) public function __construct(Core $core, Request $Request)
@@ -433,7 +433,7 @@ class Edit extends RecordHelper
/** /**
* Substitute Head file of groupings and save new Desc * Substitute Head file of groupings and save new Desc
* *
* @param http_request $request * @param http_request $request
* @return action_edit * @return action_edit
*/ */
public function execute(Request $request) public function execute(Request $request)

2
lib/Alchemy/Phrasea/Helper/Record/Feed.php
View File

@@ -42,7 +42,7 @@ class Feed extends RecordHelper
/** /**
* *
* @param \Alchemy\Phrasea\Core $core * @param \Alchemy\Phrasea\Core $core
* @return Feed * @return Feed
*/ */
public function __construct(Core $core, Request $Request) public function __construct(Core $core, Request $Request)

2
lib/Alchemy/Phrasea/Helper/Record/Helper.php
View File

@@ -96,7 +96,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
/** /**
* *
* @param \Alchemy\Phrasea\Core $core * @param \Alchemy\Phrasea\Core $core
* @return Helper * @return Helper
*/ */
public function __construct(Core $core, Request $Request) public function __construct(Core $core, Request $Request)

4
lib/Alchemy/Phrasea/Helper/Record/MoveCollection.php
View File

@@ -41,7 +41,7 @@ class MoveCollection extends RecordHelper
/** /**
* *
* @param \Alchemy\Phrasea\Core $core * @param \Alchemy\Phrasea\Core $core
* @return MoveCollection * @return MoveCollection
*/ */
public function __construct(Core $core, Request $Request) public function __construct(Core $core, Request $Request)
@@ -91,7 +91,7 @@ class MoveCollection extends RecordHelper
/** /**
* *
* @param http_request $request * @param http_request $request
* @return action_move * @return action_move
*/ */
public function execute(Request $request) public function execute(Request $request)

2
lib/Alchemy/Phrasea/Helper/Record/Printer.php
View File

@@ -30,7 +30,7 @@ class Printer extends RecordHelper
/** /**
* *
* @param \Alchemy\Phrasea\Core $core * @param \Alchemy\Phrasea\Core $core
* @return Printer * @return Printer
*/ */
public function __construct(Core $core, Request $Request) public function __construct(Core $core, Request $Request)

1
lib/Alchemy/Phrasea/Helper/Record/Push.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Helper\Record; namespace Alchemy\Phrasea\Helper\Record;
use Alchemy\Phrasea\Core;
use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper, use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper,
Symfony\Component\HttpFoundation\Request; Symfony\Component\HttpFoundation\Request;

2
lib/Alchemy/Phrasea/Helper/Record/Tools.php
View File

@@ -11,8 +11,6 @@
namespace Alchemy\Phrasea\Helper\Record; namespace Alchemy\Phrasea\Helper\Record;
use Alchemy\Phrasea\Core;
use Symfony\Component\HttpFoundation\Request;
use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper; use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper;
/** /**

2
lib/Alchemy/Phrasea/Helper/Record/Tooltip.php
View File

@@ -11,8 +11,6 @@
namespace Alchemy\Phrasea\Helper\Record; namespace Alchemy\Phrasea\Helper\Record;
use Alchemy\Phrasea\Core;
use Symfony\Component\HttpFoundation\Request;
use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper; use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper;
/** /**

6
lib/Alchemy/Phrasea/Helper/User/Edit.php
View File

@@ -417,11 +417,9 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
if ($v === '1') { if ($v === '1') {
$create_sbas[\phrasea::sbasFromBas($base_id)] = \phrasea::sbasFromBas($base_id); $create_sbas[\phrasea::sbasFromBas($base_id)] = \phrasea::sbasFromBas($base_id);
$create[] = $base_id; $create[] = $base_id;
} } else
else
$delete[] = $base_id; $delete[] = $base_id;
} } else {
else {
$create_sbas[\phrasea::sbasFromBas($base_id)] = \phrasea::sbasFromBas($base_id); $create_sbas[\phrasea::sbasFromBas($base_id)] = \phrasea::sbasFromBas($base_id);
$update[$base_id][$p] = $v; $update[$base_id][$p] = $v;
} }

2
lib/Alchemy/Phrasea/Helper/WorkZone.php
View File

@@ -11,8 +11,6 @@
namespace Alchemy\Phrasea\Helper; namespace Alchemy\Phrasea\Helper;
use Alchemy\Phrasea\Core;
use Symfony\Component\HttpFoundation\Request;
/** /**
* *

4
lib/Alchemy/Phrasea/Loader/Autoloader.php
View File

@@ -73,8 +73,8 @@ class Autoloader extends UniversalClassLoader
/** /**
* Check whether a class with $class name exists * Check whether a class with $class name exists
* foreach declared paths * foreach declared paths
* @param string $class * @param string $class
* @return mixed string|null * @return mixed string|null
*/ */
private function checkFile($classname) private function checkFile($classname)
{ {

2
lib/Alchemy/Phrasea/Loader/CacheAutoloader.php
View File

@@ -45,7 +45,7 @@ class CacheAutoloader extends Autoloader
/** /**
* Take a identifier cache key prefix * Take a identifier cache key prefix
* @param string $prefix * @param string $prefix
* @throws \Exceptionwhen none of the op cache code are available * @throws \Exceptionwhen none of the op cache code are available
*/ */
public function __construct($prefix, $namespace = null) public function __construct($prefix, $namespace = null)

6
lib/Alchemy/Phrasea/Out/Module/PDF.php
View File

@@ -401,8 +401,7 @@ class PDF
rename($tmp_filename, $tmp_filename . '.png'); rename($tmp_filename, $tmp_filename . '.png');
$miniConv[$RIGHT_IMG] = $tmp_filename . '.png'; $miniConv[$RIGHT_IMG] = $tmp_filename . '.png';
$RIGHT_IMG = $tmp_filename . '.png'; $RIGHT_IMG = $tmp_filename . '.png';
} } else
else
$RIGHT_IMG = $miniConv[$RIGHT_IMG]; $RIGHT_IMG = $miniConv[$RIGHT_IMG];
$wmm = (int) $size[0] * 25.4 / 72; $wmm = (int) $size[0] * 25.4 / 72;
@@ -416,8 +415,7 @@ class PDF
if ($hmm < 6) if ($hmm < 6)
$tt = (6 - $hmm) / 2; $tt = (6 - $hmm) / 2;
$this->pdf->Image($RIGHT_IMG, 200 - 0.5 - $wmm, $ytmp + 0.5 + $tt); $this->pdf->Image($RIGHT_IMG, 200 - 0.5 - $wmm, $ytmp + 0.5 + $tt);
} } else {
else {
$wmm = (int) $size[0] * 25.4 / 72; $wmm = (int) $size[0] * 25.4 / 72;
$hmm = (int) $size[1] * 25.4 / 72; $hmm = (int) $size[1] * 25.4 / 72;
if ($hmm > 6) { if ($hmm > 6) {

4
lib/Alchemy/Phrasea/Out/Tool/PhraseaPDF.php
View File

@@ -20,12 +20,12 @@ class PhraseaPDF extends \TCPDF
{ {
const FONT = 'freesans'; const FONT = 'freesans';
function Header() public function Header()
{ {
} }
function Footer() public function Footer()
{ {
$ml = $this->SetLeftMargin(0); $ml = $this->SetLeftMargin(0);
$mr = $this->SetRightMargin(0); $mr = $this->SetRightMargin(0);

10
lib/Alchemy/Phrasea/Vocabulary/ControlProvider/ControlProviderInterface.php
View File

@@ -41,13 +41,13 @@ interface ControlProviderInterface
public function validate($id); public function validate($id);
/** /**
* @return string returns the value corresponding to an id * @return string returns the value corresponding to an id
* @throws \Exception if the $id is invalid * @throws \Exception if the $id is invalid
*/ */
public function getValue($id); public function getValue($id);
/** /**
* @return mixed returns the actual ressource corresponding to an id * @return mixed returns the actual ressource corresponding to an id
* @throws \Exception if the $id is invalid * @throws \Exception if the $id is invalid
*/ */
public function getRessource($id); public function getRessource($id);
@@ -55,9 +55,9 @@ interface ControlProviderInterface
/** /**
* Find matching Term in the vocabulary repository * Find matching Term in the vocabulary repository
* *
* @param string $query A scalar quaery * @param string $query A scalar quaery
* @param \User_Adapter $for_user The user doing the query * @param \User_Adapter $for_user The user doing the query
* @param \databox $on_databox The databox where vocabulary should be requested * @param \databox $on_databox The databox where vocabulary should be requested
* *
* @return Doctrine\Common\Collections\ArrayCollection * @return Doctrine\Common\Collections\ArrayCollection
*/ */

12
lib/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProvider.php
View File

@@ -42,9 +42,9 @@ class UserProvider implements ControlProviderInterface
/** /**
* *
* @param string $query * @param string $query
* @param \User_Adapter $for_user * @param \User_Adapter $for_user
* @param \databox $on_databox * @param \databox $on_databox
* @return \Doctrine\Common\Collections\ArrayCollection * @return \Doctrine\Common\Collections\ArrayCollection
*/ */
public function find($query, \User_Adapter $for_user, \databox $on_databox = null) public function find($query, \User_Adapter $for_user, \databox $on_databox = null)
@@ -76,7 +76,7 @@ class UserProvider implements ControlProviderInterface
/** /**
* *
* @param mixed $id * @param mixed $id
* @return boolean * @return boolean
*/ */
public function validate($id) public function validate($id)
@@ -96,7 +96,7 @@ class UserProvider implements ControlProviderInterface
/** /**
* *
* @param mixed $id * @param mixed $id
* @return string * @return string
*/ */
public function getValue($id) public function getValue($id)
@@ -110,7 +110,7 @@ class UserProvider implements ControlProviderInterface
/** /**
* *
* @param mixed $id * @param mixed $id
* @return string * @return string
*/ */
public function getRessource($id) public function getRessource($id)

3
lib/Alchemy/Phrasea/Vocabulary/Controller.php
View File

@@ -33,8 +33,7 @@ class Controller
{ {
$classname = __NAMESPACE__ . '\\ControlProvider\\' . $type . 'Provider'; $classname = __NAMESPACE__ . '\\ControlProvider\\' . $type . 'Provider';
if (!class_exists($classname)) if (!class_exists($classname)) {
{
throw new \Exception('Vocabulary type not found'); throw new \Exception('Vocabulary type not found');
} }

8
lib/Alchemy/Phrasea/Vocabulary/Term.php
View File

@@ -49,10 +49,10 @@ class Term
/** /**
* Construct a Term * Construct a Term
* *
* @param string $value the scalar value of the Term * @param string $value the scalar value of the Term
* @param string $context A string defining the context of the Term * @param string $context A string defining the context of the Term
* @param ControlProviderInterface $type A Vocabulary Controller * @param ControlProviderInterface $type A Vocabulary Controller
* @param mixed $id The id of the term in the Vocabulary Controller * @param mixed $id The id of the term in the Vocabulary Controller
* *
* @return \Alchemy\Phrasea\Vocabulary\ControlProvider\Term * @return \Alchemy\Phrasea\Vocabulary\ControlProvider\Term
* @throws Exception * @throws Exception

2
lib/Doctrine/Entities/Basket.php
View File

@@ -425,4 +425,4 @@ class Basket
return $totSize; return $totSize;
} }
} }

4
lib/Doctrine/Entities/BasketElement.php
View File

@@ -234,7 +234,7 @@ class BasketElement
/** /**
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Entities\ValidationData * @return \Entities\ValidationData
*/ */
public function getUserValidationDatas(\User_Adapter $user) public function getUserValidationDatas(\User_Adapter $user)
@@ -247,4 +247,4 @@ class BasketElement
throw new \Exception('There is no such participant ' . $user->get_email()); throw new \Exception('There is no such participant ' . $user->get_email());
} }
} }

18
lib/Doctrine/Entities/LazaretAttribute.php
View File

@@ -2,7 +2,6 @@
namespace Entities; namespace Entities;
use Doctrine\ORM\Mapping as ORM;
/** /**
* Entities\LazaretAttribute * Entities\LazaretAttribute
@@ -53,12 +52,13 @@ class LazaretAttribute
/** /**
* Set name * Set name
* *
* @param string $name * @param string $name
* @return LazaretAttribute * @return LazaretAttribute
*/ */
public function setName($name) public function setName($name)
{ {
$this->name = $name; $this->name = $name;
return $this; return $this;
} }
@@ -75,12 +75,13 @@ class LazaretAttribute
/** /**
* Set value * Set value
* *
* @param string $value * @param string $value
* @return LazaretAttribute * @return LazaretAttribute
*/ */
public function setValue($value) public function setValue($value)
{ {
$this->value = $value; $this->value = $value;
return $this; return $this;
} }
@@ -97,12 +98,13 @@ class LazaretAttribute
/** /**
* Set created * Set created
* *
* @param datetime $created * @param datetime $created
* @return LazaretAttribute * @return LazaretAttribute
*/ */
public function setCreated($created) public function setCreated($created)
{ {
$this->created = $created; $this->created = $created;
return $this; return $this;
} }
@@ -119,12 +121,13 @@ class LazaretAttribute
/** /**
* Set updated * Set updated
* *
* @param datetime $updated * @param datetime $updated
* @return LazaretAttribute * @return LazaretAttribute
*/ */
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->updated = $updated; $this->updated = $updated;
return $this; return $this;
} }
@@ -141,12 +144,13 @@ class LazaretAttribute
/** /**
* Set lazaretFile * Set lazaretFile
* *
* @param Entities\LazaretFile $lazaretFile * @param Entities\LazaretFile $lazaretFile
* @return LazaretAttribute * @return LazaretAttribute
*/ */
public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null) public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
{ {
$this->lazaretFile = $lazaretFile; $this->lazaretFile = $lazaretFile;
return $this; return $this;
} }
@@ -159,4 +163,4 @@ class LazaretAttribute
{ {
return $this->lazaretFile; return $this->lazaretFile;
} }
} }

9
lib/Doctrine/Entities/LazaretCheck.php
View File

@@ -2,7 +2,6 @@
namespace Entities; namespace Entities;
use Doctrine\ORM\Mapping as ORM;
/** /**
* Entities\LazaretCheck * Entities\LazaretCheck
@@ -37,12 +36,13 @@ class LazaretCheck
/** /**
* Set lazaretFile * Set lazaretFile
* *
* @param Entities\LazaretFile $lazaretFile * @param Entities\LazaretFile $lazaretFile
* @return LazaretCheck * @return LazaretCheck
*/ */
public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null) public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
{ {
$this->lazaretFile = $lazaretFile; $this->lazaretFile = $lazaretFile;
return $this; return $this;
} }
@@ -59,12 +59,13 @@ class LazaretCheck
/** /**
* Set checkClassname * Set checkClassname
* *
* @param string $checkClassname * @param string $checkClassname
* @return LazaretCheck * @return LazaretCheck
*/ */
public function setCheckClassname($checkClassname) public function setCheckClassname($checkClassname)
{ {
$this->checkClassname = $checkClassname; $this->checkClassname = $checkClassname;
return $this; return $this;
} }
@@ -77,4 +78,4 @@ class LazaretCheck
{ {
return $this->checkClassname; return $this->checkClassname;
} }
} }

34
lib/Doctrine/Entities/LazaretFile.php
View File

@@ -2,7 +2,6 @@
namespace Entities; namespace Entities;
use Doctrine\ORM\Mapping as ORM;
/** /**
* Entities\LazaretFile * Entities\LazaretFile
@@ -87,12 +86,13 @@ class LazaretFile
/** /**
* Set pathname * Set pathname
* *
* @param string $pathname * @param string $pathname
* @return LazaretFile * @return LazaretFile
*/ */
public function setPathname($pathname) public function setPathname($pathname)
{ {
$this->pathname = $pathname; $this->pathname = $pathname;
return $this; return $this;
} }
@@ -109,12 +109,13 @@ class LazaretFile
/** /**
* Set base_id * Set base_id
* *
* @param integer $baseId * @param integer $baseId
* @return LazaretFile * @return LazaretFile
*/ */
public function setBaseId($baseId) public function setBaseId($baseId)
{ {
$this->base_id = $baseId; $this->base_id = $baseId;
return $this; return $this;
} }
@@ -131,12 +132,13 @@ class LazaretFile
/** /**
* Set uuid * Set uuid
* *
* @param string $uuid * @param string $uuid
* @return LazaretFile * @return LazaretFile
*/ */
public function setUuid($uuid) public function setUuid($uuid)
{ {
$this->uuid = $uuid; $this->uuid = $uuid;
return $this; return $this;
} }
@@ -153,12 +155,13 @@ class LazaretFile
/** /**
* Set sha256 * Set sha256
* *
* @param string $sha256 * @param string $sha256
* @return LazaretFile * @return LazaretFile
*/ */
public function setSha256($sha256) public function setSha256($sha256)
{ {
$this->sha256 = $sha256; $this->sha256 = $sha256;
return $this; return $this;
} }
@@ -175,12 +178,13 @@ class LazaretFile
/** /**
* Set created * Set created
* *
* @param datetime $created * @param datetime $created
* @return LazaretFile * @return LazaretFile
*/ */
public function setCreated($created) public function setCreated($created)
{ {
$this->created = $created; $this->created = $created;
return $this; return $this;
} }
@@ -197,12 +201,13 @@ class LazaretFile
/** /**
* Set updated * Set updated
* *
* @param datetime $updated * @param datetime $updated
* @return LazaretFile * @return LazaretFile
*/ */
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->updated = $updated; $this->updated = $updated;
return $this; return $this;
} }
@@ -219,12 +224,13 @@ class LazaretFile
/** /**
* Add attributes * Add attributes
* *
* @param Entities\LazaretAttribute $attributes * @param Entities\LazaretAttribute $attributes
* @return LazaretFile * @return LazaretFile
*/ */
public function addLazaretAttribute(\Entities\LazaretAttribute $attributes) public function addLazaretAttribute(\Entities\LazaretAttribute $attributes)
{ {
$this->attributes[] = $attributes; $this->attributes[] = $attributes;
return $this; return $this;
} }
@@ -241,12 +247,13 @@ class LazaretFile
/** /**
* Set session * Set session
* *
* @param Entities\LazaretSession $session * @param Entities\LazaretSession $session
* @return LazaretFile * @return LazaretFile
*/ */
public function setSession(\Entities\LazaretSession $session = null) public function setSession(\Entities\LazaretSession $session = null)
{ {
$this->session = $session; $this->session = $session;
return $this; return $this;
} }
@@ -263,12 +270,13 @@ class LazaretFile
/** /**
* Set originalName * Set originalName
* *
* @param string $originalName * @param string $originalName
* @return LazaretFile * @return LazaretFile
*/ */
public function setOriginalName($originalName) public function setOriginalName($originalName)
{ {
$this->originalName = $originalName; $this->originalName = $originalName;
return $this; return $this;
} }
@@ -285,12 +293,13 @@ class LazaretFile
/** /**
* Add checks * Add checks
* *
* @param Entities\LazaretCheck $checks * @param Entities\LazaretCheck $checks
* @return LazaretFile * @return LazaretFile
*/ */
public function addLazaretCheck(\Entities\LazaretCheck $checks) public function addLazaretCheck(\Entities\LazaretCheck $checks)
{ {
$this->checks[] = $checks; $this->checks[] = $checks;
return $this; return $this;
} }
@@ -307,12 +316,13 @@ class LazaretFile
/** /**
* Set forced * Set forced
* *
* @param boolean $forced * @param boolean $forced
* @return LazaretFile * @return LazaretFile
*/ */
public function setForced($forced) public function setForced($forced)
{ {
$this->forced = $forced; $this->forced = $forced;
return $this; return $this;
} }

20
lib/Doctrine/Entities/LazaretSession.php
View File

@@ -2,7 +2,6 @@
namespace Entities; namespace Entities;
use Doctrine\ORM\Mapping as ORM;
/** /**
* Entities\LazaretSession * Entities\LazaretSession
@@ -52,12 +51,13 @@ class LazaretSession
/** /**
* Set usr_id * Set usr_id
* *
* @param integer $usrId * @param integer $usrId
* @return LazaretSession * @return LazaretSession
*/ */
public function setUsrId($usrId) public function setUsrId($usrId)
{ {
$this->usr_id = $usrId; $this->usr_id = $usrId;
return $this; return $this;
} }
@@ -70,10 +70,10 @@ class LazaretSession
{ {
$user = null; $user = null;
try{ try {
$appbox = \appbox::get_instance(\bootstrap::getCore()); $appbox = \appbox::get_instance(\bootstrap::getCore());
$user = \User_Adapter::getInstance($this->usr_id, $appbox); $user = \User_Adapter::getInstance($this->usr_id, $appbox);
}catch(\Exception $e){ } catch (\Exception $e) {
} }
@@ -83,12 +83,13 @@ class LazaretSession
/** /**
* Set created * Set created
* *
* @param datetime $created * @param datetime $created
* @return LazaretSession * @return LazaretSession
*/ */
public function setCreated($created) public function setCreated($created)
{ {
$this->created = $created; $this->created = $created;
return $this; return $this;
} }
@@ -105,12 +106,13 @@ class LazaretSession
/** /**
* Set updated * Set updated
* *
* @param datetime $updated * @param datetime $updated
* @return LazaretSession * @return LazaretSession
*/ */
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->updated = $updated; $this->updated = $updated;
return $this; return $this;
} }
@@ -127,12 +129,13 @@ class LazaretSession
/** /**
* Add files * Add files
* *
* @param Entities\LazaretFile $files * @param Entities\LazaretFile $files
* @return LazaretSession * @return LazaretSession
*/ */
public function addLazaretFiles(\Entities\LazaretFile $files) public function addLazaretFiles(\Entities\LazaretFile $files)
{ {
$this->files[] = $files; $this->files[] = $files;
return $this; return $this;
} }
@@ -149,12 +152,13 @@ class LazaretSession
/** /**
* Add files * Add files
* *
* @param Entities\LazaretFile $files * @param Entities\LazaretFile $files
* @return LazaretSession * @return LazaretSession
*/ */
public function addLazaretFile(\Entities\LazaretFile $files) public function addLazaretFile(\Entities\LazaretFile $files)
{ {
$this->files[] = $files; $this->files[] = $files;
return $this; return $this;
} }
} }

2
lib/Doctrine/Entities/StoryWZ.php
View File

@@ -161,4 +161,4 @@ class StoryWZ
$this->setRecordId($record->get_record_id()); $this->setRecordId($record->get_record_id());
$this->setSbasId($record->get_sbas_id()); $this->setSbasId($record->get_sbas_id());
} }
} }

6
lib/Doctrine/Entities/UsrList.php
View File

@@ -157,7 +157,7 @@ class UsrList
/** /**
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Entities\UsrListOwner * @return \Entities\UsrListOwner
*/ */
public function getOwner(\User_Adapter $user) public function getOwner(\User_Adapter $user)
@@ -194,7 +194,7 @@ class UsrList
/** /**
* Return true if one of the entry is related to the given user * Return true if one of the entry is related to the given user
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return boolean * @return boolean
*/ */
public function has(\User_Adapter $user) public function has(\User_Adapter $user)
@@ -205,4 +205,4 @@ class UsrList
} }
); );
} }
} }

2
lib/Doctrine/Entities/UsrListEntry.php
View File

@@ -142,4 +142,4 @@ class UsrListEntry
{ {
return $this->setUsrId($user->get_id()); return $this->setUsrId($user->get_id());
} }
} }

2
lib/Doctrine/Entities/UsrListOwner.php
View File

@@ -174,4 +174,4 @@ class UsrListOwner
{ {
return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance(\bootstrap::getCore())); return \User_Adapter::getInstance($this->getUsrId(), \appbox::get_instance(\bootstrap::getCore()));
} }
} }

2
lib/Doctrine/Entities/ValidationData.php
View File

@@ -157,4 +157,4 @@ class ValidationData
{ {
return $this->basket_element; return $this->basket_element;
} }
} }

4
lib/Doctrine/Entities/ValidationParticipant.php
View File

@@ -150,7 +150,7 @@ class ValidationParticipant
/** /**
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return ValidationParticipant * @return ValidationParticipant
*/ */
public function setUser(\User_Adapter $user) public function setUser(\User_Adapter $user)
@@ -271,4 +271,4 @@ class ValidationParticipant
return true; return true;
} }
} }

2
lib/Doctrine/Entities/ValidationSession.php
View File

@@ -368,4 +368,4 @@ class ValidationSession
} }
} }
} }
} }

3
lib/Doctrine/Logger/MonologSQLLogger.php
View File

@@ -12,7 +12,6 @@
namespace Doctrine\Logger; namespace Doctrine\Logger;
use Monolog\Logger; use Monolog\Logger;
use Monolog\Handler\StreamHandler;
/** /**
* Log doctrine sql request with monolog * Log doctrine sql request with monolog
@@ -39,7 +38,7 @@ class MonologSQLLogger implements \Doctrine\DBAL\Logging\SQLLogger
* Tell which monolog user to use and which format to output * Tell which monolog user to use and which format to output
* *
* @param \Monolog\Logger $logger A monolog logger instance * @param \Monolog\Logger $logger A monolog logger instance
* @param type $type the output format * @param type $type the output format
*/ */
public function __construct(\Monolog\Logger $logger, $type = self::YAML) public function __construct(\Monolog\Logger $logger, $type = self::YAML)
{ {

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

@@ -41,175 +41,203 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setName($name) public function setName($name)
{ {
$this->__load(); $this->__load();
return parent::setName($name); return parent::setName($name);
} }
public function getName() public function getName()
{ {
$this->__load(); $this->__load();
return parent::getName(); return parent::getName();
} }
public function setDescription($description) public function setDescription($description)
{ {
$this->__load(); $this->__load();
return parent::setDescription($description); return parent::setDescription($description);
} }
public function getDescription() public function getDescription()
{ {
$this->__load(); $this->__load();
return parent::getDescription(); return parent::getDescription();
} }
public function setUsrId($usrId) public function setUsrId($usrId)
{ {
$this->__load(); $this->__load();
return parent::setUsrId($usrId); return parent::setUsrId($usrId);
} }
public function getUsrId() public function getUsrId()
{ {
$this->__load(); $this->__load();
return parent::getUsrId(); return parent::getUsrId();
} }
public function setPusherId($pusherId) public function setPusherId($pusherId)
{ {
$this->__load(); $this->__load();
return parent::setPusherId($pusherId); return parent::setPusherId($pusherId);
} }
public function getPusherId() public function getPusherId()
{ {
$this->__load(); $this->__load();
return parent::getPusherId(); return parent::getPusherId();
} }
public function setArchived($archived) public function setArchived($archived)
{ {
$this->__load(); $this->__load();
return parent::setArchived($archived); return parent::setArchived($archived);
} }
public function getArchived() public function getArchived()
{ {
$this->__load(); $this->__load();
return parent::getArchived(); return parent::getArchived();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function addBasketElement(\Entities\BasketElement $elements) public function addBasketElement(\Entities\BasketElement $elements)
{ {
$this->__load(); $this->__load();
return parent::addBasketElement($elements); return parent::addBasketElement($elements);
} }
public function getElements() public function getElements()
{ {
$this->__load(); $this->__load();
return parent::getElements(); return parent::getElements();
} }
public function getElementsByOrder($ordre) public function getElementsByOrder($ordre)
{ {
$this->__load(); $this->__load();
return parent::getElementsByOrder($ordre); return parent::getElementsByOrder($ordre);
} }
public function setPusher(\User_Adapter $user) public function setPusher(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::setPusher($user); return parent::setPusher($user);
} }
public function getPusher() public function getPusher()
{ {
$this->__load(); $this->__load();
return parent::getPusher(); return parent::getPusher();
} }
public function setOwner(\User_Adapter $user) public function setOwner(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::setOwner($user); return parent::setOwner($user);
} }
public function getOwner() public function getOwner()
{ {
$this->__load(); $this->__load();
return parent::getOwner(); return parent::getOwner();
} }
public function setValidation(\Entities\ValidationSession $validation) public function setValidation(\Entities\ValidationSession $validation)
{ {
$this->__load(); $this->__load();
return parent::setValidation($validation); return parent::setValidation($validation);
} }
public function getValidation() public function getValidation()
{ {
$this->__load(); $this->__load();
return parent::getValidation(); return parent::getValidation();
} }
public function setIsRead($isRead) public function setIsRead($isRead)
{ {
$this->__load(); $this->__load();
return parent::setIsRead($isRead); return parent::setIsRead($isRead);
} }
public function getIsRead() public function getIsRead()
{ {
$this->__load(); $this->__load();
return parent::getIsRead(); return parent::getIsRead();
} }
public function hasRecord(\record_adapter $record) public function hasRecord(\record_adapter $record)
{ {
$this->__load(); $this->__load();
return parent::hasRecord($record); return parent::hasRecord($record);
} }
public function getSize() public function getSize()
{ {
$this->__load(); $this->__load();
return parent::getSize(); return parent::getSize();
} }
@@ -233,6 +261,6 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

25
lib/Doctrine/Proxies/__CG__EntitiesBasketElement.php
View File

@@ -41,121 +41,140 @@ class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Pro
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setRecordId($recordId) public function setRecordId($recordId)
{ {
$this->__load(); $this->__load();
return parent::setRecordId($recordId); return parent::setRecordId($recordId);
} }
public function getRecordId() public function getRecordId()
{ {
$this->__load(); $this->__load();
return parent::getRecordId(); return parent::getRecordId();
} }
public function setSbasId($sbasId) public function setSbasId($sbasId)
{ {
$this->__load(); $this->__load();
return parent::setSbasId($sbasId); return parent::setSbasId($sbasId);
} }
public function getSbasId() public function getSbasId()
{ {
$this->__load(); $this->__load();
return parent::getSbasId(); return parent::getSbasId();
} }
public function setOrd($ord) public function setOrd($ord)
{ {
$this->__load(); $this->__load();
return parent::setOrd($ord); return parent::setOrd($ord);
} }
public function getOrd() public function getOrd()
{ {
$this->__load(); $this->__load();
return parent::getOrd(); return parent::getOrd();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function setBasket(\Entities\Basket $basket) public function setBasket(\Entities\Basket $basket)
{ {
$this->__load(); $this->__load();
return parent::setBasket($basket); return parent::setBasket($basket);
} }
public function getBasket() public function getBasket()
{ {
$this->__load(); $this->__load();
return parent::getBasket(); return parent::getBasket();
} }
public function getRecord() public function getRecord()
{ {
$this->__load(); $this->__load();
return parent::getRecord(); return parent::getRecord();
} }
public function setRecord(\record_adapter $record) public function setRecord(\record_adapter $record)
{ {
$this->__load(); $this->__load();
return parent::setRecord($record); return parent::setRecord($record);
} }
public function setLastInBasket() public function setLastInBasket()
{ {
$this->__load(); $this->__load();
return parent::setLastInBasket(); return parent::setLastInBasket();
} }
public function addValidationData(\Entities\ValidationData $validationDatas) public function addValidationData(\Entities\ValidationData $validationDatas)
{ {
$this->__load(); $this->__load();
return parent::addValidationData($validationDatas); return parent::addValidationData($validationDatas);
} }
public function getValidationDatas() public function getValidationDatas()
{ {
$this->__load(); $this->__load();
return parent::getValidationDatas(); return parent::getValidationDatas();
} }
public function getUserValidationDatas(\User_Adapter $user) public function getUserValidationDatas(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::getUserValidationDatas($user); return parent::getUserValidationDatas($user);
} }
@@ -179,6 +198,6 @@ class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Pro
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

17
lib/Doctrine/Proxies/__CG__EntitiesLazaretAttribute.php
View File

@@ -41,73 +41,84 @@ class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\O
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setName($name) public function setName($name)
{ {
$this->__load(); $this->__load();
return parent::setName($name); return parent::setName($name);
} }
public function getName() public function getName()
{ {
$this->__load(); $this->__load();
return parent::getName(); return parent::getName();
} }
public function setValue($value) public function setValue($value)
{ {
$this->__load(); $this->__load();
return parent::setValue($value); return parent::setValue($value);
} }
public function getValue() public function getValue()
{ {
$this->__load(); $this->__load();
return parent::getValue(); return parent::getValue();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL) public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
{ {
$this->__load(); $this->__load();
return parent::setLazaretFile($lazaretFile); return parent::setLazaretFile($lazaretFile);
} }
public function getLazaretFile() public function getLazaretFile()
{ {
$this->__load(); $this->__load();
return parent::getLazaretFile(); return parent::getLazaretFile();
} }
@@ -131,6 +142,6 @@ class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\O
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

11
lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php
View File

@@ -41,37 +41,42 @@ class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setCheck($check) public function setCheck($check)
{ {
$this->__load(); $this->__load();
return parent::setCheck($check); return parent::setCheck($check);
} }
public function getCheck() public function getCheck()
{ {
$this->__load(); $this->__load();
return parent::getCheck(); return parent::getCheck();
} }
public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL) public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
{ {
$this->__load(); $this->__load();
return parent::setLazaretFile($lazaretFile); return parent::setLazaretFile($lazaretFile);
} }
public function getLazaretFile() public function getLazaretFile()
{ {
$this->__load(); $this->__load();
return parent::getLazaretFile(); return parent::getLazaretFile();
} }
@@ -95,6 +100,6 @@ class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

29
lib/Doctrine/Proxies/__CG__EntitiesLazaretFile.php
View File

@@ -41,145 +41,168 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setPathname($pathname) public function setPathname($pathname)
{ {
$this->__load(); $this->__load();
return parent::setPathname($pathname); return parent::setPathname($pathname);
} }
public function getPathname() public function getPathname()
{ {
$this->__load(); $this->__load();
return parent::getPathname(); return parent::getPathname();
} }
public function setBaseId($baseId) public function setBaseId($baseId)
{ {
$this->__load(); $this->__load();
return parent::setBaseId($baseId); return parent::setBaseId($baseId);
} }
public function getBaseId() public function getBaseId()
{ {
$this->__load(); $this->__load();
return parent::getBaseId(); return parent::getBaseId();
} }
public function setUuid($uuid) public function setUuid($uuid)
{ {
$this->__load(); $this->__load();
return parent::setUuid($uuid); return parent::setUuid($uuid);
} }
public function getUuid() public function getUuid()
{ {
$this->__load(); $this->__load();
return parent::getUuid(); return parent::getUuid();
} }
public function setSha256($sha256) public function setSha256($sha256)
{ {
$this->__load(); $this->__load();
return parent::setSha256($sha256); return parent::setSha256($sha256);
} }
public function getSha256() public function getSha256()
{ {
$this->__load(); $this->__load();
return parent::getSha256(); return parent::getSha256();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function addLazaretAttribute(\Entities\LazaretAttribute $attributes) public function addLazaretAttribute(\Entities\LazaretAttribute $attributes)
{ {
$this->__load(); $this->__load();
return parent::addLazaretAttribute($attributes); return parent::addLazaretAttribute($attributes);
} }
public function getAttributes() public function getAttributes()
{ {
$this->__load(); $this->__load();
return parent::getAttributes(); return parent::getAttributes();
} }
public function setSession(\Entities\LazaretSession $session = NULL) public function setSession(\Entities\LazaretSession $session = NULL)
{ {
$this->__load(); $this->__load();
return parent::setSession($session); return parent::setSession($session);
} }
public function getSession() public function getSession()
{ {
$this->__load(); $this->__load();
return parent::getSession(); return parent::getSession();
} }
public function setOriginalName($originalName) public function setOriginalName($originalName)
{ {
$this->__load(); $this->__load();
return parent::setOriginalName($originalName); return parent::setOriginalName($originalName);
} }
public function getOriginalName() public function getOriginalName()
{ {
$this->__load(); $this->__load();
return parent::getOriginalName(); return parent::getOriginalName();
} }
public function addLazaretCheck(\Entities\LazaretCheck $checks) public function addLazaretCheck(\Entities\LazaretCheck $checks)
{ {
$this->__load(); $this->__load();
return parent::addLazaretCheck($checks); return parent::addLazaretCheck($checks);
} }
public function getChecks() public function getChecks()
{ {
$this->__load(); $this->__load();
return parent::getChecks(); return parent::getChecks();
} }
public function setForced($forced) public function setForced($forced)
{ {
$this->__load(); $this->__load();
return parent::setForced($forced); return parent::setForced($forced);
} }
public function getForced() public function getForced()
{ {
$this->__load(); $this->__load();
return parent::getForced(); return parent::getForced();
} }
@@ -203,6 +226,6 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

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

@@ -41,67 +41,77 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setUsrId($usrId) public function setUsrId($usrId)
{ {
$this->__load(); $this->__load();
return parent::setUsrId($usrId); return parent::setUsrId($usrId);
} }
public function getUsrId() public function getUsrId()
{ {
$this->__load(); $this->__load();
return parent::getUsrId(); return parent::getUsrId();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function addLazaretFiles(\Entities\LazaretFile $files) public function addLazaretFiles(\Entities\LazaretFile $files)
{ {
$this->__load(); $this->__load();
return parent::addLazaretFiles($files); return parent::addLazaretFiles($files);
} }
public function getFiles() public function getFiles()
{ {
$this->__load(); $this->__load();
return parent::getFiles(); return parent::getFiles();
} }
public function addLazaretFile(\Entities\LazaretFile $files) public function addLazaretFile(\Entities\LazaretFile $files)
{ {
$this->__load(); $this->__load();
return parent::addLazaretFile($files); return parent::addLazaretFile($files);
} }
@@ -125,6 +135,6 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

19
lib/Doctrine/Proxies/__CG__EntitiesStoryWZ.php
View File

@@ -41,85 +41,98 @@ class StoryWZ extends \Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setSbasId($sbasId) public function setSbasId($sbasId)
{ {
$this->__load(); $this->__load();
return parent::setSbasId($sbasId); return parent::setSbasId($sbasId);
} }
public function getSbasId() public function getSbasId()
{ {
$this->__load(); $this->__load();
return parent::getSbasId(); return parent::getSbasId();
} }
public function setRecordId($recordId) public function setRecordId($recordId)
{ {
$this->__load(); $this->__load();
return parent::setRecordId($recordId); return parent::setRecordId($recordId);
} }
public function getRecordId() public function getRecordId()
{ {
$this->__load(); $this->__load();
return parent::getRecordId(); return parent::getRecordId();
} }
public function setUsrId($usrId) public function setUsrId($usrId)
{ {
$this->__load(); $this->__load();
return parent::setUsrId($usrId); return parent::setUsrId($usrId);
} }
public function getUsrId() public function getUsrId()
{ {
$this->__load(); $this->__load();
return parent::getUsrId(); return parent::getUsrId();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUser(\User_Adapter $user) public function setUser(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::setUser($user); return parent::setUser($user);
} }
public function getUser() public function getUser()
{ {
$this->__load(); $this->__load();
return parent::getUser(); return parent::getUser();
} }
public function getRecord() public function getRecord()
{ {
$this->__load(); $this->__load();
return parent::getRecord(); return parent::getRecord();
} }
public function setRecord(\record_adapter $record) public function setRecord(\record_adapter $record)
{ {
$this->__load(); $this->__load();
return parent::setRecord($record); return parent::setRecord($record);
} }
@@ -143,6 +156,6 @@ class StoryWZ extends \Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

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

@@ -41,91 +41,105 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setName($name) public function setName($name)
{ {
$this->__load(); $this->__load();
return parent::setName($name); return parent::setName($name);
} }
public function getName() public function getName()
{ {
$this->__load(); $this->__load();
return parent::getName(); return parent::getName();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function addUsrListOwner(\Entities\UsrListOwner $owners) public function addUsrListOwner(\Entities\UsrListOwner $owners)
{ {
$this->__load(); $this->__load();
return parent::addUsrListOwner($owners); return parent::addUsrListOwner($owners);
} }
public function getOwners() public function getOwners()
{ {
$this->__load(); $this->__load();
return parent::getOwners(); return parent::getOwners();
} }
public function hasAccess(\User_Adapter $user) public function hasAccess(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::hasAccess($user); return parent::hasAccess($user);
} }
public function getOwner(\User_Adapter $user) public function getOwner(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::getOwner($user); return parent::getOwner($user);
} }
public function addUsrListEntry(\Entities\UsrListEntry $entry) public function addUsrListEntry(\Entities\UsrListEntry $entry)
{ {
$this->__load(); $this->__load();
return parent::addUsrListEntry($entry); return parent::addUsrListEntry($entry);
} }
public function getEntries() public function getEntries()
{ {
$this->__load(); $this->__load();
return parent::getEntries(); return parent::getEntries();
} }
public function has(\User_Adapter $user) public function has(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::has($user); return parent::has($user);
} }
@@ -149,6 +163,6 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

17
lib/Doctrine/Proxies/__CG__EntitiesUsrListEntry.php
View File

@@ -41,73 +41,84 @@ class UsrListEntry extends \Entities\UsrListEntry implements \Doctrine\ORM\Proxy
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setUsrId($usrId) public function setUsrId($usrId)
{ {
$this->__load(); $this->__load();
return parent::setUsrId($usrId); return parent::setUsrId($usrId);
} }
public function getUsrId() public function getUsrId()
{ {
$this->__load(); $this->__load();
return parent::getUsrId(); return parent::getUsrId();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function setList(\Entities\UsrList $list) public function setList(\Entities\UsrList $list)
{ {
$this->__load(); $this->__load();
return parent::setList($list); return parent::setList($list);
} }
public function getList() public function getList()
{ {
$this->__load(); $this->__load();
return parent::getList(); return parent::getList();
} }
public function getUser() public function getUser()
{ {
$this->__load(); $this->__load();
return parent::getUser(); return parent::getUser();
} }
public function setUser(\User_Adapter $user) public function setUser(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::setUser($user); return parent::setUser($user);
} }
@@ -131,6 +142,6 @@ class UsrListEntry extends \Entities\UsrListEntry implements \Doctrine\ORM\Proxy
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

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

@@ -41,85 +41,98 @@ class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setUsrId($usrId) public function setUsrId($usrId)
{ {
$this->__load(); $this->__load();
return parent::setUsrId($usrId); return parent::setUsrId($usrId);
} }
public function getUsrId() public function getUsrId()
{ {
$this->__load(); $this->__load();
return parent::getUsrId(); return parent::getUsrId();
} }
public function setRole($role) public function setRole($role)
{ {
$this->__load(); $this->__load();
return parent::setRole($role); return parent::setRole($role);
} }
public function getRole() public function getRole()
{ {
$this->__load(); $this->__load();
return parent::getRole(); return parent::getRole();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function setList(\Entities\UsrList $list) public function setList(\Entities\UsrList $list)
{ {
$this->__load(); $this->__load();
return parent::setList($list); return parent::setList($list);
} }
public function getList() public function getList()
{ {
$this->__load(); $this->__load();
return parent::getList(); return parent::getList();
} }
public function setUser(\User_Adapter $user) public function setUser(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::setUser($user); return parent::setUser($user);
} }
public function getUser() public function getUser()
{ {
$this->__load(); $this->__load();
return parent::getUser(); return parent::getUser();
} }
@@ -143,6 +156,6 @@ class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

17
lib/Doctrine/Proxies/__CG__EntitiesValidationData.php
View File

@@ -41,73 +41,84 @@ class ValidationData extends \Entities\ValidationData implements \Doctrine\ORM\P
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setAgreement($agreement) public function setAgreement($agreement)
{ {
$this->__load(); $this->__load();
return parent::setAgreement($agreement); return parent::setAgreement($agreement);
} }
public function getAgreement() public function getAgreement()
{ {
$this->__load(); $this->__load();
return parent::getAgreement(); return parent::getAgreement();
} }
public function setNote($note) public function setNote($note)
{ {
$this->__load(); $this->__load();
return parent::setNote($note); return parent::setNote($note);
} }
public function getNote() public function getNote()
{ {
$this->__load(); $this->__load();
return parent::getNote(); return parent::getNote();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function setParticipant(\Entities\ValidationParticipant $participant) public function setParticipant(\Entities\ValidationParticipant $participant)
{ {
$this->__load(); $this->__load();
return parent::setParticipant($participant); return parent::setParticipant($participant);
} }
public function getParticipant() public function getParticipant()
{ {
$this->__load(); $this->__load();
return parent::getParticipant(); return parent::getParticipant();
} }
public function setBasketElement(\Entities\BasketElement $basketElement) public function setBasketElement(\Entities\BasketElement $basketElement)
{ {
$this->__load(); $this->__load();
return parent::setBasketElement($basketElement); return parent::setBasketElement($basketElement);
} }
public function getBasketElement() public function getBasketElement()
{ {
$this->__load(); $this->__load();
return parent::getBasketElement(); return parent::getBasketElement();
} }
@@ -131,6 +142,6 @@ class ValidationData extends \Entities\ValidationData implements \Doctrine\ORM\P
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

26
lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php
View File

@@ -41,127 +41,147 @@ class ValidationParticipant extends \Entities\ValidationParticipant implements \
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setUsrId($usrId) public function setUsrId($usrId)
{ {
$this->__load(); $this->__load();
return parent::setUsrId($usrId); return parent::setUsrId($usrId);
} }
public function getUsrId() public function getUsrId()
{ {
$this->__load(); $this->__load();
return parent::getUsrId(); return parent::getUsrId();
} }
public function addValidationData(\Entities\ValidationData $datas) public function addValidationData(\Entities\ValidationData $datas)
{ {
$this->__load(); $this->__load();
return parent::addValidationData($datas); return parent::addValidationData($datas);
} }
public function setSession(\Entities\ValidationSession $session) public function setSession(\Entities\ValidationSession $session)
{ {
$this->__load(); $this->__load();
return parent::setSession($session); return parent::setSession($session);
} }
public function getSession() public function getSession()
{ {
$this->__load(); $this->__load();
return parent::getSession(); return parent::getSession();
} }
public function setIsAware($isAware) public function setIsAware($isAware)
{ {
$this->__load(); $this->__load();
return parent::setIsAware($isAware); return parent::setIsAware($isAware);
} }
public function getIsAware() public function getIsAware()
{ {
$this->__load(); $this->__load();
return parent::getIsAware(); return parent::getIsAware();
} }
public function setUser(\User_Adapter $user) public function setUser(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::setUser($user); return parent::setUser($user);
} }
public function getUser() public function getUser()
{ {
$this->__load(); $this->__load();
return parent::getUser(); return parent::getUser();
} }
public function setReminded($reminded) public function setReminded($reminded)
{ {
$this->__load(); $this->__load();
return parent::setReminded($reminded); return parent::setReminded($reminded);
} }
public function getReminded() public function getReminded()
{ {
$this->__load(); $this->__load();
return parent::getReminded(); return parent::getReminded();
} }
public function getDatas() public function getDatas()
{ {
$this->__load(); $this->__load();
return parent::getDatas(); return parent::getDatas();
} }
public function setIsConfirmed($isConfirmed) public function setIsConfirmed($isConfirmed)
{ {
$this->__load(); $this->__load();
return parent::setIsConfirmed($isConfirmed); return parent::setIsConfirmed($isConfirmed);
} }
public function getIsConfirmed() public function getIsConfirmed()
{ {
$this->__load(); $this->__load();
return parent::getIsConfirmed(); return parent::getIsConfirmed();
} }
public function setCanAgree($canAgree) public function setCanAgree($canAgree)
{ {
$this->__load(); $this->__load();
return parent::setCanAgree($canAgree); return parent::setCanAgree($canAgree);
} }
public function getCanAgree() public function getCanAgree()
{ {
$this->__load(); $this->__load();
return parent::getCanAgree(); return parent::getCanAgree();
} }
public function setCanSeeOthers($canSeeOthers) public function setCanSeeOthers($canSeeOthers)
{ {
$this->__load(); $this->__load();
return parent::setCanSeeOthers($canSeeOthers); return parent::setCanSeeOthers($canSeeOthers);
} }
public function getCanSeeOthers() public function getCanSeeOthers()
{ {
$this->__load(); $this->__load();
return parent::getCanSeeOthers(); return parent::getCanSeeOthers();
} }
public function isReleasable() public function isReleasable()
{ {
$this->__load(); $this->__load();
return parent::isReleasable(); return parent::isReleasable();
} }
@@ -185,6 +205,6 @@ class ValidationParticipant extends \Entities\ValidationParticipant implements \
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

33
lib/Doctrine/Proxies/__CG__EntitiesValidationSession.php
View File

@@ -41,169 +41,196 @@ class ValidationSession extends \Entities\ValidationSession implements \Doctrine
return $this->__isInitialized__; return $this->__isInitialized__;
} }
public function getId() public function getId()
{ {
if ($this->__isInitialized__ === false) { if ($this->__isInitialized__ === false) {
return (int) $this->_identifier["id"]; return (int) $this->_identifier["id"];
} }
$this->__load(); $this->__load();
return parent::getId(); return parent::getId();
} }
public function setName($name) public function setName($name)
{ {
$this->__load(); $this->__load();
return parent::setName($name); return parent::setName($name);
} }
public function getName() public function getName()
{ {
$this->__load(); $this->__load();
return parent::getName(); return parent::getName();
} }
public function setDescription($description) public function setDescription($description)
{ {
$this->__load(); $this->__load();
return parent::setDescription($description); return parent::setDescription($description);
} }
public function getDescription() public function getDescription()
{ {
$this->__load(); $this->__load();
return parent::getDescription(); return parent::getDescription();
} }
public function setArchived($archived) public function setArchived($archived)
{ {
$this->__load(); $this->__load();
return parent::setArchived($archived); return parent::setArchived($archived);
} }
public function getArchived() public function getArchived()
{ {
$this->__load(); $this->__load();
return parent::getArchived(); return parent::getArchived();
} }
public function setCreated($created) public function setCreated($created)
{ {
$this->__load(); $this->__load();
return parent::setCreated($created); return parent::setCreated($created);
} }
public function getCreated() public function getCreated()
{ {
$this->__load(); $this->__load();
return parent::getCreated(); return parent::getCreated();
} }
public function setUpdated($updated) public function setUpdated($updated)
{ {
$this->__load(); $this->__load();
return parent::setUpdated($updated); return parent::setUpdated($updated);
} }
public function getUpdated() public function getUpdated()
{ {
$this->__load(); $this->__load();
return parent::getUpdated(); return parent::getUpdated();
} }
public function setExpires($expires) public function setExpires($expires)
{ {
$this->__load(); $this->__load();
return parent::setExpires($expires); return parent::setExpires($expires);
} }
public function getExpires() public function getExpires()
{ {
$this->__load(); $this->__load();
return parent::getExpires(); return parent::getExpires();
} }
public function setReminded($reminded) public function setReminded($reminded)
{ {
$this->__load(); $this->__load();
return parent::setReminded($reminded); return parent::setReminded($reminded);
} }
public function getReminded() public function getReminded()
{ {
$this->__load(); $this->__load();
return parent::getReminded(); return parent::getReminded();
} }
public function setBasket(\Entities\Basket $basket) public function setBasket(\Entities\Basket $basket)
{ {
$this->__load(); $this->__load();
return parent::setBasket($basket); return parent::setBasket($basket);
} }
public function getBasket() public function getBasket()
{ {
$this->__load(); $this->__load();
return parent::getBasket(); return parent::getBasket();
} }
public function addValidationParticipant(\Entities\ValidationParticipant $participants) public function addValidationParticipant(\Entities\ValidationParticipant $participants)
{ {
$this->__load(); $this->__load();
return parent::addValidationParticipant($participants); return parent::addValidationParticipant($participants);
} }
public function getParticipants() public function getParticipants()
{ {
$this->__load(); $this->__load();
return parent::getParticipants(); return parent::getParticipants();
} }
public function getParticipant(\User_Adapter $user) public function getParticipant(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::getParticipant($user); return parent::getParticipant($user);
} }
public function setInitiatorId($initiatorId) public function setInitiatorId($initiatorId)
{ {
$this->__load(); $this->__load();
return parent::setInitiatorId($initiatorId); return parent::setInitiatorId($initiatorId);
} }
public function getInitiatorId() public function getInitiatorId()
{ {
$this->__load(); $this->__load();
return parent::getInitiatorId(); return parent::getInitiatorId();
} }
public function isInitiator(\User_Adapter $user) public function isInitiator(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::isInitiator($user); return parent::isInitiator($user);
} }
public function setInitiator(\User_Adapter $user) public function setInitiator(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::setInitiator($user); return parent::setInitiator($user);
} }
public function getInitiator() public function getInitiator()
{ {
$this->__load(); $this->__load();
return parent::getInitiator(); return parent::getInitiator();
} }
public function isFinished() public function isFinished()
{ {
$this->__load(); $this->__load();
return parent::isFinished(); return parent::isFinished();
} }
public function getValidationString(\User_Adapter $user) public function getValidationString(\User_Adapter $user)
{ {
$this->__load(); $this->__load();
return parent::getValidationString($user); return parent::getValidationString($user);
} }
@@ -227,6 +254,6 @@ class ValidationSession extends \Entities\ValidationSession implements \Doctrine
} }
unset($this->_entityPersister, $this->_identifier); unset($this->_entityPersister, $this->_identifier);
} }
} }
} }

5
lib/Doctrine/Repositories/BasketElementRepository.php
View File

@@ -3,7 +3,6 @@
namespace Repositories; namespace Repositories;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\UnitOfWork;
use Entities; use Entities;
/** /**
@@ -68,8 +67,8 @@ class BasketElementRepository extends EntityRepository
/** /**
* *
* @param \record_adapter $record * @param \record_adapter $record
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection * @return \Doctrine\Common\Collections\ArrayCollection
*/ */
public function findReceivedElementsByRecord(\record_adapter $record, \User_Adapter $user) public function findReceivedElementsByRecord(\record_adapter $record, \User_Adapter $user)

14
lib/Doctrine/Repositories/BasketRepository.php
View File

@@ -29,7 +29,7 @@ class BasketRepository extends EntityRepository
/** /**
* Returns all basket for a given user that are not marked as archived * Returns all basket for a given user that are not marked as archived
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection * @return \Doctrine\Common\Collections\ArrayCollection
*/ */
public function findActiveByUser(\User_Adapter $user, $sort = null) public function findActiveByUser(\User_Adapter $user, $sort = null)
@@ -55,7 +55,7 @@ class BasketRepository extends EntityRepository
/** /**
* Returns all unread basket for a given user that are not marked as archived * Returns all unread basket for a given user that are not marked as archived
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection * @return \Doctrine\Common\Collections\ArrayCollection
*/ */
public function findUnreadActiveByUser(\User_Adapter $user) public function findUnreadActiveByUser(\User_Adapter $user)
@@ -90,7 +90,7 @@ class BasketRepository extends EntityRepository
* Returns all baskets that are in validation session not expired and * Returns all baskets that are in validation session not expired and
* where a specified user is participant (not owner) * where a specified user is participant (not owner)
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection * @return \Doctrine\Common\Collections\ArrayCollection
*/ */
public function findActiveValidationByUser(\User_Adapter $user, $sort = null) public function findActiveValidationByUser(\User_Adapter $user, $sort = null)
@@ -121,8 +121,8 @@ class BasketRepository extends EntityRepository
* *
* @throws \Exception_NotFound * @throws \Exception_NotFound
* @throws \Exception_Forbidden * @throws \Exception_Forbidden
* @param type $basket_id * @param type $basket_id
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Entities\Basket * @return \Entities\Basket
*/ */
public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner) public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner)
@@ -271,8 +271,8 @@ class BasketRepository extends EntityRepository
/** /**
* Return all actives validation where current user is involved and user basket * Return all actives validation where current user is involved and user basket
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @param type $sort * @param type $sort
* @return Array * @return Array
*/ */
public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null) public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)

2
lib/Doctrine/Repositories/UsrListEntryRepository.php
View File

@@ -17,7 +17,7 @@ class UsrListEntryRepository extends EntityRepository
* Get all lists entries matching a given User * Get all lists entries matching a given User
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @param type $like * @param type $like
*/ */
public function findUserList(\User_Adapter $user) public function findUserList(\User_Adapter $user)
{ {

8
lib/Doctrine/Repositories/UsrListOwnerRepository.php
View File

@@ -16,8 +16,8 @@ class UsrListOwnerRepository extends EntityRepository
/** /**
* *
* *
* @param \Entities\UsrList $list * @param \Entities\UsrList $list
* @param type $owner_id * @param type $owner_id
* @return \Entities\UsrList * @return \Entities\UsrList
*/ */
public function findByListAndOwner(\Entities\UsrList $list, $owner_id) public function findByListAndOwner(\Entities\UsrList $list, $owner_id)
@@ -39,8 +39,8 @@ class UsrListOwnerRepository extends EntityRepository
/** /**
* *
* *
* @param \Entities\UsrList $list * @param \Entities\UsrList $list
* @param type $usr_id * @param type $usr_id
* @return \Entities\UsrList * @return \Entities\UsrList
*/ */
public function findByListAndUsrId(\Entities\UsrList $list, $usr_id) public function findByListAndUsrId(\Entities\UsrList $list, $usr_id)

10
lib/Doctrine/Repositories/UsrListRepository.php
View File

@@ -16,7 +16,7 @@ class UsrListRepository extends EntityRepository
/** /**
* Get all lists readable for a given User * Get all lists readable for a given User
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection * @return \Doctrine\Common\Collections\ArrayCollection
*/ */
public function findUserLists(\User_Adapter $user) public function findUserLists(\User_Adapter $user)
@@ -38,8 +38,8 @@ class UsrListRepository extends EntityRepository
/** /**
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @param type $list_id * @param type $list_id
* @return \Entities\UsrList * @return \Entities\UsrList
*/ */
public function findUserListByUserAndId(\User_Adapter $user, $list_id) public function findUserListByUserAndId(\User_Adapter $user, $list_id)
@@ -61,8 +61,8 @@ class UsrListRepository extends EntityRepository
/** /**
* Search for a UsrList like '' with a given value, for a user * Search for a UsrList like '' with a given value, for a user
* *
* @param \User_Adapter $user * @param \User_Adapter $user
* @param type $name * @param type $name
* @return \Doctrine\Common\Collections\ArrayCollection * @return \Doctrine\Common\Collections\ArrayCollection
*/ */
public function findUserListLike(\User_Adapter $user, $name) public function findUserListLike(\User_Adapter $user, $name)

1504
lib/classes/ACL.class.php
View File

File diff suppressed because it is too large Load Diff

20
lib/classes/API/OAuth2/Account.class.php
View File

@@ -78,8 +78,8 @@ class API_OAuth2_Account
/** /**
* Constructor * Constructor
* *
* @param appbox $appbox * @param appbox $appbox
* @param int $account_id * @param int $account_id
* @return API_OAuth2_Account * @return API_OAuth2_Account
*/ */
public function __construct(appbox &$appbox, $account_id) public function __construct(appbox &$appbox, $account_id)
@@ -144,7 +144,7 @@ class API_OAuth2_Account
/** /**
* *
* @param boolean $boolean * @param boolean $boolean
* @return API_OAuth2_Account * @return API_OAuth2_Account
*/ */
public function set_revoked($boolean) public function set_revoked($boolean)
@@ -177,7 +177,7 @@ class API_OAuth2_Account
/** /**
* *
* @return API_OAuth2_Token * @return API_OAuth2_Token
*/ */
public function get_token() public function get_token()
{ {
@@ -230,9 +230,9 @@ class API_OAuth2_Account
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @param User_Adapter $user * @param User_Adapter $user
* @param API_OAuth2_Application $application * @param API_OAuth2_Application $application
* @return API_OAuth2_Account * @return API_OAuth2_Account
*/ */
public static function create(appbox &$appbox, User_Adapter $user, API_OAuth2_Application $application) public static function create(appbox &$appbox, User_Adapter $user, API_OAuth2_Application $application)
@@ -261,9 +261,9 @@ class API_OAuth2_Account
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @param API_OAuth2_Application $application * @param API_OAuth2_Application $application
* @param User_Adapter $user * @param User_Adapter $user
* @return API_OAuth2_Account * @return API_OAuth2_Account
*/ */
public static function load_with_user(appbox &$appbox, API_OAuth2_Application $application, User_Adapter $user) public static function load_with_user(appbox &$appbox, API_OAuth2_Application $application, User_Adapter $user)

49
lib/classes/API/OAuth2/Adapter.class.php
View File

@@ -83,7 +83,7 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @return API_OAuth2_Adapter * @return API_OAuth2_Adapter
*/ */
public function __construct(appbox $appbox) public function __construct(appbox $appbox)
@@ -115,7 +115,7 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param array $params * @param array $params
* @return API_OAuth2_Adapter * @return API_OAuth2_Adapter
*/ */
public function setParams(array $params) public function setParams(array $params)
@@ -170,8 +170,8 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param string $secret * @param string $secret
* @param string $nonce * @param string $nonce
* @return string * @return string
*/ */
protected static function crypt_secret($secret, $nonce) protected static function crypt_secret($secret, $nonce)
@@ -185,8 +185,8 @@ class API_OAuth2_Adapter extends OAuth2
* *
* Implements OAuth2::checkClientCredentials(). * Implements OAuth2::checkClientCredentials().
* *
* @param string $client_id * @param string $client_id
* @param string $client_secret * @param string $client_secret
* @return boolean * @return boolean
*/ */
protected function checkClientCredentials($client_id, $client_secret = NULL) protected function checkClientCredentials($client_id, $client_secret = NULL)
@@ -212,7 +212,7 @@ class API_OAuth2_Adapter extends OAuth2
* *
* Implements OAuth2::getRedirectUri(). * Implements OAuth2::getRedirectUri().
* *
* @param string $client_id * @param string $client_id
* @return string * @return string
*/ */
protected function getRedirectUri($client_id) protected function getRedirectUri($client_id)
@@ -226,7 +226,7 @@ class API_OAuth2_Adapter extends OAuth2
* *
* Implements OAuth2::getAccessToken(). * Implements OAuth2::getAccessToken().
* *
* @param string $oauth_token * @param string $oauth_token
* @return array * @return array
*/ */
protected function getAccessToken($oauth_token) protected function getAccessToken($oauth_token)
@@ -258,10 +258,10 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param type $oauth_token * @param type $oauth_token
* @param type $account_id * @param type $account_id
* @param type $expires * @param type $expires
* @param string $scope * @param string $scope
* @return API_OAuth2_Adapter * @return API_OAuth2_Adapter
*/ */
protected function setAccessToken($oauth_token, $account_id, $expires, $scope = NULL) protected function setAccessToken($oauth_token, $account_id, $expires, $scope = NULL)
@@ -326,11 +326,11 @@ class API_OAuth2_Adapter extends OAuth2
* *
* Overrides OAuth2::setAuthCode(). * Overrides OAuth2::setAuthCode().
* *
* @param string $code * @param string $code
* @param int $account_id * @param int $account_id
* @param string $redirect_uri * @param string $redirect_uri
* @param string $expires * @param string $expires
* @param string $scope * @param string $scope
* @return API_OAuth2_Adapter * @return API_OAuth2_Adapter
*/ */
protected function setAuthCode($code, $account_id, $redirect_uri, $expires, $scope = NULL) protected function setAuthCode($code, $account_id, $redirect_uri, $expires, $scope = NULL)
@@ -386,7 +386,7 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param Symfony\Component\HttpFoundation\Request $request * @param Symfony\Component\HttpFoundation\Request $request
* @return array * @return array
*/ */
public function getAuthorizationRequestParameters(Symfony\Component\HttpFoundation\Request $request) public function getAuthorizationRequestParameters(Symfony\Component\HttpFoundation\Request $request)
@@ -477,8 +477,7 @@ class API_OAuth2_Adapter extends OAuth2
), $redirect_uri); ), $redirect_uri);
if ($compare !== 0) if ($compare !== 0)
$this->errorDoRedirectUriCallback($input["redirect_uri"], OAUTH2_ERROR_REDIRECT_URI_MISMATCH, NULL, NULL, $input["state"]); $this->errorDoRedirectUriCallback($input["redirect_uri"], OAUTH2_ERROR_REDIRECT_URI_MISMATCH, NULL, NULL, $input["state"]);
} } elseif ($redirect_uri) {
elseif ($redirect_uri) {
/** /**
* They did not provide a uri from input, so use the stored one * They did not provide a uri from input, so use the stored one
*/ */
@@ -524,7 +523,7 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param usr_id $usr_id * @param usr_id $usr_id
* @return API_OAuth2_Account * @return API_OAuth2_Account
*/ */
public function updateAccount($usr_id) public function updateAccount($usr_id)
@@ -544,7 +543,7 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param int $usr_id * @param int $usr_id
* @return API_OAuth2_Account * @return API_OAuth2_Account
*/ */
private function createAccount($usr_id) private function createAccount($usr_id)
@@ -556,8 +555,8 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param <type> $is_authorized * @param <type> $is_authorized
* @param array $params * @param array $params
* @return string * @return string
*/ */
public function finishNativeClientAuthorization($is_authorized, $params = array()) public function finishNativeClientAuthorization($is_authorized, $params = array())
@@ -587,7 +586,7 @@ class API_OAuth2_Adapter extends OAuth2
/** /**
* *
* @param <type> $redirect_uri * @param <type> $redirect_uri
* @return <type> * @return <type>
*/ */
public function isNativeApp($redirect_uri) public function isNativeApp($redirect_uri)

42
lib/classes/API/OAuth2/Application.class.php
View File

@@ -126,8 +126,8 @@ class API_OAuth2_Application
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @param int $application_id * @param int $application_id
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function __construct(appbox &$appbox, $application_id) public function __construct(appbox &$appbox, $application_id)
@@ -202,7 +202,7 @@ class API_OAuth2_Application
/** /**
* *
* @param string $type * @param string $type
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_type($type) public function set_type($type)
@@ -241,7 +241,7 @@ class API_OAuth2_Application
/** /**
* *
* @param string $name * @param string $name
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_name($name) public function set_name($name)
@@ -274,7 +274,7 @@ class API_OAuth2_Application
/** /**
* *
* @param string $description * @param string $description
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_description($description) public function set_description($description)
@@ -308,7 +308,7 @@ class API_OAuth2_Application
/** /**
* *
* @param string $website * @param string $website
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_website($website) public function set_website($website)
@@ -342,7 +342,7 @@ class API_OAuth2_Application
/** /**
* *
* @param boolean $activated * @param boolean $activated
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_activated($activated) public function set_activated($activated)
@@ -376,7 +376,7 @@ class API_OAuth2_Application
/** /**
* *
* @param boolean $grant * @param boolean $grant
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_grant_password($grant) public function set_grant_password($grant)
@@ -428,7 +428,7 @@ class API_OAuth2_Application
/** /**
* *
* @param int $client_id * @param int $client_id
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_client_id($client_id) public function set_client_id($client_id)
@@ -462,7 +462,7 @@ class API_OAuth2_Application
/** /**
* *
* @param string $client_secret * @param string $client_secret
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_client_secret($client_secret) public function set_client_secret($client_secret)
@@ -496,7 +496,7 @@ class API_OAuth2_Application
/** /**
* *
* @param string $redirect_uri * @param string $redirect_uri
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public function set_redirect_uri($redirect_uri) public function set_redirect_uri($redirect_uri)
@@ -520,7 +520,7 @@ class API_OAuth2_Application
/** /**
* *
* @param User_Adapter $user * @param User_Adapter $user
* @return API_OAuth2_Account * @return API_OAuth2_Account
*/ */
public function get_user_account(user_adapter $user) public function get_user_account(user_adapter $user)
@@ -589,9 +589,9 @@ class API_OAuth2_Application
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @param User_Adapter $user * @param User_Adapter $user
* @param type $name * @param type $name
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public static function create(appbox &$appbox, User_Adapter $user = null, $name) public static function create(appbox &$appbox, User_Adapter $user = null, $name)
@@ -637,8 +637,8 @@ class API_OAuth2_Application
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @param type $client_id * @param type $client_id
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public static function load_from_client_id(appbox &$appbox, $client_id) public static function load_from_client_id(appbox &$appbox, $client_id)
@@ -659,8 +659,8 @@ class API_OAuth2_Application
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @param User_Adapter $user * @param User_Adapter $user
* @return array * @return array
*/ */
public static function load_dev_app_by_user(appbox &$appbox, User_Adapter $user) public static function load_dev_app_by_user(appbox &$appbox, User_Adapter $user)
@@ -684,8 +684,8 @@ class API_OAuth2_Application
/** /**
* *
* @param appbox $appbox * @param appbox $appbox
* @param user_adapter $user * @param user_adapter $user
* @return API_OAuth2_Application * @return API_OAuth2_Application
*/ */
public static function load_app_by_user(appbox $appbox, user_adapter $user) public static function load_app_by_user(appbox $appbox, user_adapter $user)

Some files were not shown because too many files have changed in this diff Show More