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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -21,12 +21,12 @@ class Factory
/**
* 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
* @param string $serialized The serialized value of the attribute
* @param string $serialized The serialized value of the attribute
* (Attribute::asString result)
* @return Attribute The attribute
* @throws \InvalidArgumentException
* @return Attribute The attribute
* @throws \InvalidArgumentException
*/
public static function getFileAttribute($name, $serialized)
{

View File

@@ -34,10 +34,10 @@ class MetaField implements Attribute
/**
* Constructor
*
* @param \databox_field $databox_field The databox field
* @param type $value A scalar value
* @param \databox_field $databox_field The databox field
* @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)
{

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -46,9 +46,9 @@ class File
/**
* Constructor
*
* @param Media $media The media
* @param \collection $collection The destination collection
* @param string $originalName The original name of the file
* @param Media $media The media
* @param \collection $collection The destination collection
* @param string $originalName The original name of the file
* (if not provided, original name is
* extracted from the pathfile)
*/
@@ -77,9 +77,9 @@ class File
* @todo Check if an UUID is contained in the attributes, replace It if
* necessary
*
* @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
* @return File
* @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
* @return File
*/
public function getUUID($generate = false, $write = false)
{
@@ -253,8 +253,8 @@ class File
/**
* Adds an attribute to the file package
*
* @param Attribute\Attribute $attribute The attribute
* @return File
* @param Attribute\Attribute $attribute The attribute
* @return File
*/
public function addAttribute(Attribute\Attribute $attribute)
{
@@ -266,9 +266,9 @@ class File
/**
* Build the File package object
*
* @param string $pathfile The path to the file
* @param \collection $collection The destination collection
* @param string $originalName An optionnal original name (if
* @param string $pathfile The path to the file
* @param \collection $collection The destination collection
* @param string $originalName An optionnal original name (if
* different from the $pathfile filename)
* @throws \InvalidArgumentException
*

View File

@@ -42,7 +42,7 @@ class Manager
/**
* Constructor
*
* @param \Doctrine\ORM\EntityManager $em Entity manager
* @param \Doctrine\ORM\EntityManager $em Entity manager
*/
public function __construct(EntityManager $em)
{
@@ -62,14 +62,14 @@ class Manager
/**
* Add a file to Phraseanet after having checked it
*
* @param LazaretSession $session The current Lazaret Session
* @param File $file A File package object
* @param type $callable A callback to execute after process
* @param LazaretSession $session The current Lazaret Session
* @param File $file A File package object
* @param type $callable A callback to execute after process
* (arguments are $element (LazaretFile or \record_adapter),
* $visa (Visa)
* and $code (self::RECORD_CREATED or self::LAZARET_CREATED))
* @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
* @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
*/
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
*
* @param File $file A File package object
* @return Visa The Visa
* @param File $file A File package object
* @return Visa The Visa
*/
public function getVisa(File $file)
{
@@ -123,8 +123,8 @@ class Manager
/**
* Registers a checker
*
* @param Checker\Checker $checker The checker to register
* @return Manager
* @param Checker\Checker $checker The checker to register
* @return Manager
*/
public function registerChecker(Checker\Checker $checker)
{
@@ -136,8 +136,8 @@ class Manager
/**
* Registers an array of checkers
*
* @param array $checkers Array of checkers
* @return Manager
* @param array $checkers Array of checkers
* @return Manager
*/
public function registerCheckers(array $checkers)
{
@@ -151,8 +151,8 @@ class Manager
/**
* Unregister a checker
*
* @param Checker\Checker $checker The checker to unregister
* @return Manager
* @param Checker\Checker $checker The checker to unregister
* @return Manager
*/
public function unregisterChecker(Checker\Checker $checker)
{
@@ -181,8 +181,8 @@ class Manager
/**
* Find an available Lazaret filename and creates the empty file.
*
* @param string $filename The desired filename
* @return string The available filename to use
* @param string $filename The desired filename
* @return string The available filename to use
*/
protected function bookLazaretPathfile($filename)
{
@@ -205,8 +205,8 @@ class Manager
/**
* Adds a record to Phraseanet
*
* @param File $file The package file
* @return \record_adater
* @param File $file The package file
* @return \record_adater
*/
protected function createRecord(File $file)
{
@@ -373,10 +373,10 @@ class Manager
/**
* Send a package file to lazaret
*
* @param File $file The package file
* @param Visa $visa The visa related to the package file
* @param LazaretSession $session The current LazaretSession
* @param Boolean $forced True if the file has been forced to quarantine
* @param File $file The package file
* @param Visa $visa The visa related to the package file
* @param LazaretSession $session The current LazaretSession
* @param Boolean $forced True if the file has been forced to quarantine
* @return \Entities\LazaretFile
*/
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
* to Phraseanet
*
* @param File $file The file
* @return \Doctrine\ORM\EntityManager
* @param File $file The file
* @return \Doctrine\ORM\EntityManager
*/
protected function addMediaAttributes(File &$file)
{

View File

@@ -46,8 +46,8 @@ class Visa
/**
* Add a checker Response to the visa
*
* @param Checker\Response $response A Checker Response
* @return Visa
* @param Checker\Response $response A Checker Response
* @return Visa
*/
public function addResponse(Checker\Response $response)
{
@@ -59,7 +59,7 @@ class Visa
/**
* 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()
{

View File

@@ -35,7 +35,7 @@ interface Cache extends DoctrineCache
/**
* 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 FALSE, if no cache entry exists for the given id.
* @ throws Alchemy\Phrasea\Cache\Exception if provided key does not exist
@@ -45,7 +45,7 @@ interface Cache extends DoctrineCache
/**
* 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
*/
public function deleteMulti(array $keys);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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
*/
public function __construct(Core $core, Request $Request)

View File

@@ -41,7 +41,7 @@ class MoveCollection extends RecordHelper
/**
*
* @param \Alchemy\Phrasea\Core $core
* @param \Alchemy\Phrasea\Core $core
* @return MoveCollection
*/
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
*/
public function execute(Request $request)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -41,13 +41,13 @@ interface ControlProviderInterface
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
*/
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
*/
public function getRessource($id);
@@ -55,9 +55,9 @@ interface ControlProviderInterface
/**
* Find matching Term in the vocabulary repository
*
* @param string $query A scalar quaery
* @param \User_Adapter $for_user The user doing the query
* @param \databox $on_databox The databox where vocabulary should be requested
* @param string $query A scalar quaery
* @param \User_Adapter $for_user The user doing the query
* @param \databox $on_databox The databox where vocabulary should be requested
*
* @return Doctrine\Common\Collections\ArrayCollection
*/

View File

@@ -42,9 +42,9 @@ class UserProvider implements ControlProviderInterface
/**
*
* @param string $query
* @param \User_Adapter $for_user
* @param \databox $on_databox
* @param string $query
* @param \User_Adapter $for_user
* @param \databox $on_databox
* @return \Doctrine\Common\Collections\ArrayCollection
*/
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
*/
public function validate($id)
@@ -96,7 +96,7 @@ class UserProvider implements ControlProviderInterface
/**
*
* @param mixed $id
* @param mixed $id
* @return string
*/
public function getValue($id)
@@ -110,7 +110,7 @@ class UserProvider implements ControlProviderInterface
/**
*
* @param mixed $id
* @param mixed $id
* @return string
*/
public function getRessource($id)

View File

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

View File

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

View File

@@ -234,7 +234,7 @@ class BasketElement
/**
*
* @param \User_Adapter $user
* @param \User_Adapter $user
* @return \Entities\ValidationData
*/
public function getUserValidationDatas(\User_Adapter $user)

View File

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

View File

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

View File

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

View File

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

View File

@@ -157,7 +157,7 @@ class UsrList
/**
*
* @param \User_Adapter $user
* @param \User_Adapter $user
* @return \Entities\UsrListOwner
*/
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
*
* @param \User_Adapter $user
* @param \User_Adapter $user
* @return boolean
*/
public function has(\User_Adapter $user)

View File

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

View File

@@ -12,7 +12,6 @@
namespace Doctrine\Logger;
use Monolog\Logger;
use Monolog\Handler\StreamHandler;
/**
* 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
*
* @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)
{

View File

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

View File

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

View File

@@ -48,66 +48,77 @@ class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\O
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setName($name)
{
$this->__load();
return parent::setName($name);
}
public function getName()
{
$this->__load();
return parent::getName();
}
public function setValue($value)
{
$this->__load();
return parent::setValue($value);
}
public function getValue()
{
$this->__load();
return parent::getValue();
}
public function setCreated($created)
{
$this->__load();
return parent::setCreated($created);
}
public function getCreated()
{
$this->__load();
return parent::getCreated();
}
public function setUpdated($updated)
{
$this->__load();
return parent::setUpdated($updated);
}
public function getUpdated()
{
$this->__load();
return parent::getUpdated();
}
public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
{
$this->__load();
return parent::setLazaretFile($lazaretFile);
}
public function getLazaretFile()
{
$this->__load();
return parent::getLazaretFile();
}

View File

@@ -48,30 +48,35 @@ class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setCheck($check)
{
$this->__load();
return parent::setCheck($check);
}
public function getCheck()
{
$this->__load();
return parent::getCheck();
}
public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
{
$this->__load();
return parent::setLazaretFile($lazaretFile);
}
public function getLazaretFile()
{
$this->__load();
return parent::getLazaretFile();
}

View File

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

View File

@@ -48,60 +48,70 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setUsrId($usrId)
{
$this->__load();
return parent::setUsrId($usrId);
}
public function getUsrId()
{
$this->__load();
return parent::getUsrId();
}
public function setCreated($created)
{
$this->__load();
return parent::setCreated($created);
}
public function getCreated()
{
$this->__load();
return parent::getCreated();
}
public function setUpdated($updated)
{
$this->__load();
return parent::setUpdated($updated);
}
public function getUpdated()
{
$this->__load();
return parent::getUpdated();
}
public function addLazaretFiles(\Entities\LazaretFile $files)
{
$this->__load();
return parent::addLazaretFiles($files);
}
public function getFiles()
{
$this->__load();
return parent::getFiles();
}
public function addLazaretFile(\Entities\LazaretFile $files)
{
$this->__load();
return parent::addLazaretFile($files);
}

View File

@@ -48,78 +48,91 @@ class StoryWZ extends \Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setSbasId($sbasId)
{
$this->__load();
return parent::setSbasId($sbasId);
}
public function getSbasId()
{
$this->__load();
return parent::getSbasId();
}
public function setRecordId($recordId)
{
$this->__load();
return parent::setRecordId($recordId);
}
public function getRecordId()
{
$this->__load();
return parent::getRecordId();
}
public function setUsrId($usrId)
{
$this->__load();
return parent::setUsrId($usrId);
}
public function getUsrId()
{
$this->__load();
return parent::getUsrId();
}
public function setCreated($created)
{
$this->__load();
return parent::setCreated($created);
}
public function getCreated()
{
$this->__load();
return parent::getCreated();
}
public function setUser(\User_Adapter $user)
{
$this->__load();
return parent::setUser($user);
}
public function getUser()
{
$this->__load();
return parent::getUser();
}
public function getRecord()
{
$this->__load();
return parent::getRecord();
}
public function setRecord(\record_adapter $record)
{
$this->__load();
return parent::setRecord($record);
}

View File

@@ -48,84 +48,98 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setName($name)
{
$this->__load();
return parent::setName($name);
}
public function getName()
{
$this->__load();
return parent::getName();
}
public function setCreated($created)
{
$this->__load();
return parent::setCreated($created);
}
public function getCreated()
{
$this->__load();
return parent::getCreated();
}
public function setUpdated($updated)
{
$this->__load();
return parent::setUpdated($updated);
}
public function getUpdated()
{
$this->__load();
return parent::getUpdated();
}
public function addUsrListOwner(\Entities\UsrListOwner $owners)
{
$this->__load();
return parent::addUsrListOwner($owners);
}
public function getOwners()
{
$this->__load();
return parent::getOwners();
}
public function hasAccess(\User_Adapter $user)
{
$this->__load();
return parent::hasAccess($user);
}
public function getOwner(\User_Adapter $user)
{
$this->__load();
return parent::getOwner($user);
}
public function addUsrListEntry(\Entities\UsrListEntry $entry)
{
$this->__load();
return parent::addUsrListEntry($entry);
}
public function getEntries()
{
$this->__load();
return parent::getEntries();
}
public function has(\User_Adapter $user)
{
$this->__load();
return parent::has($user);
}

View File

@@ -48,66 +48,77 @@ class UsrListEntry extends \Entities\UsrListEntry implements \Doctrine\ORM\Proxy
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setUsrId($usrId)
{
$this->__load();
return parent::setUsrId($usrId);
}
public function getUsrId()
{
$this->__load();
return parent::getUsrId();
}
public function setCreated($created)
{
$this->__load();
return parent::setCreated($created);
}
public function getCreated()
{
$this->__load();
return parent::getCreated();
}
public function setUpdated($updated)
{
$this->__load();
return parent::setUpdated($updated);
}
public function getUpdated()
{
$this->__load();
return parent::getUpdated();
}
public function setList(\Entities\UsrList $list)
{
$this->__load();
return parent::setList($list);
}
public function getList()
{
$this->__load();
return parent::getList();
}
public function getUser()
{
$this->__load();
return parent::getUser();
}
public function setUser(\User_Adapter $user)
{
$this->__load();
return parent::setUser($user);
}

View File

@@ -48,78 +48,91 @@ class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setUsrId($usrId)
{
$this->__load();
return parent::setUsrId($usrId);
}
public function getUsrId()
{
$this->__load();
return parent::getUsrId();
}
public function setRole($role)
{
$this->__load();
return parent::setRole($role);
}
public function getRole()
{
$this->__load();
return parent::getRole();
}
public function setCreated($created)
{
$this->__load();
return parent::setCreated($created);
}
public function getCreated()
{
$this->__load();
return parent::getCreated();
}
public function setUpdated($updated)
{
$this->__load();
return parent::setUpdated($updated);
}
public function getUpdated()
{
$this->__load();
return parent::getUpdated();
}
public function setList(\Entities\UsrList $list)
{
$this->__load();
return parent::setList($list);
}
public function getList()
{
$this->__load();
return parent::getList();
}
public function setUser(\User_Adapter $user)
{
$this->__load();
return parent::setUser($user);
}
public function getUser()
{
$this->__load();
return parent::getUser();
}

View File

@@ -48,66 +48,77 @@ class ValidationData extends \Entities\ValidationData implements \Doctrine\ORM\P
return (int) $this->_identifier["id"];
}
$this->__load();
return parent::getId();
}
public function setAgreement($agreement)
{
$this->__load();
return parent::setAgreement($agreement);
}
public function getAgreement()
{
$this->__load();
return parent::getAgreement();
}
public function setNote($note)
{
$this->__load();
return parent::setNote($note);
}
public function getNote()
{
$this->__load();
return parent::getNote();
}
public function setUpdated($updated)
{
$this->__load();
return parent::setUpdated($updated);
}
public function getUpdated()
{
$this->__load();
return parent::getUpdated();
}
public function setParticipant(\Entities\ValidationParticipant $participant)
{
$this->__load();
return parent::setParticipant($participant);
}
public function getParticipant()
{
$this->__load();
return parent::getParticipant();
}
public function setBasketElement(\Entities\BasketElement $basketElement)
{
$this->__load();
return parent::setBasketElement($basketElement);
}
public function getBasketElement()
{
$this->__load();
return parent::getBasketElement();
}

View File

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

View File

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

View File

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

View File

@@ -29,7 +29,7 @@ class BasketRepository extends EntityRepository
/**
* 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
*/
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
*
* @param \User_Adapter $user
* @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection
*/
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
* where a specified user is participant (not owner)
*
* @param \User_Adapter $user
* @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection
*/
public function findActiveValidationByUser(\User_Adapter $user, $sort = null)
@@ -121,8 +121,8 @@ class BasketRepository extends EntityRepository
*
* @throws \Exception_NotFound
* @throws \Exception_Forbidden
* @param type $basket_id
* @param \User_Adapter $user
* @param type $basket_id
* @param \User_Adapter $user
* @return \Entities\Basket
*/
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
*
* @param \User_Adapter $user
* @param type $sort
* @param \User_Adapter $user
* @param type $sort
* @return Array
*/
public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)

View File

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

View File

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

View File

@@ -16,7 +16,7 @@ class UsrListRepository extends EntityRepository
/**
* Get all lists readable for a given User
*
* @param \User_Adapter $user
* @param \User_Adapter $user
* @return \Doctrine\Common\Collections\ArrayCollection
*/
public function findUserLists(\User_Adapter $user)
@@ -38,8 +38,8 @@ class UsrListRepository extends EntityRepository
/**
*
* @param \User_Adapter $user
* @param type $list_id
* @param \User_Adapter $user
* @param type $list_id
* @return \Entities\UsrList
*/
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
*
* @param \User_Adapter $user
* @param type $name
* @param \User_Adapter $user
* @param type $name
* @return \Doctrine\Common\Collections\ArrayCollection
*/
public function findUserListLike(\User_Adapter $user, $name)

File diff suppressed because it is too large Load Diff

View File

@@ -78,8 +78,8 @@ class API_OAuth2_Account
/**
* Constructor
*
* @param appbox $appbox
* @param int $account_id
* @param appbox $appbox
* @param int $account_id
* @return API_OAuth2_Account
*/
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
*/
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()
{
@@ -230,9 +230,9 @@ class API_OAuth2_Account
/**
*
* @param appbox $appbox
* @param User_Adapter $user
* @param API_OAuth2_Application $application
* @param appbox $appbox
* @param User_Adapter $user
* @param API_OAuth2_Application $application
* @return API_OAuth2_Account
*/
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 API_OAuth2_Application $application
* @param User_Adapter $user
* @param appbox $appbox
* @param API_OAuth2_Application $application
* @param User_Adapter $user
* @return API_OAuth2_Account
*/
public static function load_with_user(appbox &$appbox, API_OAuth2_Application $application, User_Adapter $user)

View File

@@ -83,7 +83,7 @@ class API_OAuth2_Adapter extends OAuth2
/**
*
* @param appbox $appbox
* @param appbox $appbox
* @return API_OAuth2_Adapter
*/
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
*/
public function setParams(array $params)
@@ -170,8 +170,8 @@ class API_OAuth2_Adapter extends OAuth2
/**
*
* @param string $secret
* @param string $nonce
* @param string $secret
* @param string $nonce
* @return string
*/
protected static function crypt_secret($secret, $nonce)
@@ -185,8 +185,8 @@ class API_OAuth2_Adapter extends OAuth2
*
* Implements OAuth2::checkClientCredentials().
*
* @param string $client_id
* @param string $client_secret
* @param string $client_id
* @param string $client_secret
* @return boolean
*/
protected function checkClientCredentials($client_id, $client_secret = NULL)
@@ -212,7 +212,7 @@ class API_OAuth2_Adapter extends OAuth2
*
* Implements OAuth2::getRedirectUri().
*
* @param string $client_id
* @param string $client_id
* @return string
*/
protected function getRedirectUri($client_id)
@@ -226,7 +226,7 @@ class API_OAuth2_Adapter extends OAuth2
*
* Implements OAuth2::getAccessToken().
*
* @param string $oauth_token
* @param string $oauth_token
* @return array
*/
protected function getAccessToken($oauth_token)
@@ -258,10 +258,10 @@ class API_OAuth2_Adapter extends OAuth2
/**
*
* @param type $oauth_token
* @param type $account_id
* @param type $expires
* @param string $scope
* @param type $oauth_token
* @param type $account_id
* @param type $expires
* @param string $scope
* @return API_OAuth2_Adapter
*/
protected function setAccessToken($oauth_token, $account_id, $expires, $scope = NULL)
@@ -326,11 +326,11 @@ class API_OAuth2_Adapter extends OAuth2
*
* Overrides OAuth2::setAuthCode().
*
* @param string $code
* @param int $account_id
* @param string $redirect_uri
* @param string $expires
* @param string $scope
* @param string $code
* @param int $account_id
* @param string $redirect_uri
* @param string $expires
* @param string $scope
* @return API_OAuth2_Adapter
*/
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
*/
public function getAuthorizationRequestParameters(Symfony\Component\HttpFoundation\Request $request)
@@ -477,8 +477,7 @@ class API_OAuth2_Adapter extends OAuth2
), $redirect_uri);
if ($compare !== 0)
$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
*/
@@ -524,7 +523,7 @@ class API_OAuth2_Adapter extends OAuth2
/**
*
* @param usr_id $usr_id
* @param usr_id $usr_id
* @return API_OAuth2_Account
*/
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
*/
private function createAccount($usr_id)
@@ -556,8 +555,8 @@ class API_OAuth2_Adapter extends OAuth2
/**
*
* @param <type> $is_authorized
* @param array $params
* @param <type> $is_authorized
* @param array $params
* @return string
*/
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>
*/
public function isNativeApp($redirect_uri)

View File

@@ -126,8 +126,8 @@ class API_OAuth2_Application
/**
*
* @param appbox $appbox
* @param int $application_id
* @param appbox $appbox
* @param int $application_id
* @return API_OAuth2_Application
*/
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
*/
public function set_type($type)
@@ -241,7 +241,7 @@ class API_OAuth2_Application
/**
*
* @param string $name
* @param string $name
* @return API_OAuth2_Application
*/
public function set_name($name)
@@ -274,7 +274,7 @@ class API_OAuth2_Application
/**
*
* @param string $description
* @param string $description
* @return API_OAuth2_Application
*/
public function set_description($description)
@@ -308,7 +308,7 @@ class API_OAuth2_Application
/**
*
* @param string $website
* @param string $website
* @return API_OAuth2_Application
*/
public function set_website($website)
@@ -342,7 +342,7 @@ class API_OAuth2_Application
/**
*
* @param boolean $activated
* @param boolean $activated
* @return API_OAuth2_Application
*/
public function set_activated($activated)
@@ -376,7 +376,7 @@ class API_OAuth2_Application
/**
*
* @param boolean $grant
* @param boolean $grant
* @return API_OAuth2_Application
*/
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
*/
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
*/
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
*/
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
*/
public function get_user_account(user_adapter $user)
@@ -589,9 +589,9 @@ class API_OAuth2_Application
/**
*
* @param appbox $appbox
* @param User_Adapter $user
* @param type $name
* @param appbox $appbox
* @param User_Adapter $user
* @param type $name
* @return API_OAuth2_Application
*/
public static function create(appbox &$appbox, User_Adapter $user = null, $name)
@@ -637,8 +637,8 @@ class API_OAuth2_Application
/**
*
* @param appbox $appbox
* @param type $client_id
* @param appbox $appbox
* @param type $client_id
* @return API_OAuth2_Application
*/
public static function load_from_client_id(appbox &$appbox, $client_id)
@@ -659,8 +659,8 @@ class API_OAuth2_Application
/**
*
* @param appbox $appbox
* @param User_Adapter $user
* @param appbox $appbox
* @param User_Adapter $user
* @return array
*/
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 user_adapter $user
* @param appbox $appbox
* @param user_adapter $user
* @return API_OAuth2_Application
*/
public static function load_app_by_user(appbox $appbox, user_adapter $user)

View File

@@ -133,8 +133,8 @@ class API_OAuth2_AuthCode
/**
*
* @param appbox $appbox
* @param API_OAuth2_Account $account
* @param appbox $appbox
* @param API_OAuth2_Account $account
* @return array
*/
public static function load_codes_by_account(appbox &$appbox, API_OAuth2_Account $account)
@@ -160,10 +160,10 @@ class API_OAuth2_AuthCode
/**
*
* @param appbox $appbox
* @param API_OAuth2_Account $account
* @param type $code
* @param int $expires
* @param appbox $appbox
* @param API_OAuth2_Account $account
* @param type $code
* @param int $expires
* @return API_OAuth2_AuthCode
*/
public static function create(appbox &$appbox, API_OAuth2_Account $account, $code, $expires)

View File

@@ -54,11 +54,11 @@ class API_OAuth2_Exception_Exception extends Exception implements API_OAuth2_Exc
/**
*
* @param int $http_code
* @param string $error
* @param string $error_description
* @param string $scope
* @param string $error_uri
* @param int $http_code
* @param string $error
* @param string $error_description
* @param string $scope
* @param string $error_uri
* @return API_OAuth2_Exception_Exception
*/
public function __construct($http_code, $error, $error_description = null, $scope = null, $error_uri = null)
@@ -83,7 +83,7 @@ class API_OAuth2_Exception_Exception extends Exception implements API_OAuth2_Exc
/**
*
* @param int $http_code
* @param int $http_code
* @return API_OAuth2_Exception_Exception
*/
public function setHttp_code($http_code)
@@ -104,7 +104,7 @@ class API_OAuth2_Exception_Exception extends Exception implements API_OAuth2_Exc
/**
*
* @param string $scope
* @param string $scope
* @return API_OAuth2_Exception_Exception
*/
public function setError($error)
@@ -125,7 +125,7 @@ class API_OAuth2_Exception_Exception extends Exception implements API_OAuth2_Exc
/**
*
* @param string $scope
* @param string $scope
* @return API_OAuth2_Exception_Exception
*/
public function setError_description($error_description)
@@ -146,7 +146,7 @@ class API_OAuth2_Exception_Exception extends Exception implements API_OAuth2_Exc
/**
*
* @param string $scope
* @param string $scope
* @return API_OAuth2_Exception_Exception
*/
public function setError_uri($error_uri)
@@ -167,7 +167,7 @@ class API_OAuth2_Exception_Exception extends Exception implements API_OAuth2_Exc
/**
*
* @param string $scope
* @param string $scope
* @return API_OAuth2_Exception_Exception
*/
public function setScope($scope)

View File

@@ -42,11 +42,11 @@ class API_OAuth2_Exception_Redirect extends API_OAuth2_Exception_Exception
/**
*
* @param string $redirect_uri
* @param string $error
* @param string $error_description
* @param string $state
* @param string $error_uri
* @param string $redirect_uri
* @param string $error
* @param string $error_description
* @param string $state
* @param string $error_uri
* @return API_OAuth2_Exception_Redirect
*/
public function __construct($redirect_uri, $error, $error_description = null, $state = null, $error_uri = null)
@@ -69,7 +69,7 @@ class API_OAuth2_Exception_Redirect extends API_OAuth2_Exception_Exception
/**
*
* @param string $redirect_uri
* @param string $redirect_uri
* @return API_OAuth2_Exception_Redirect
*/
public function setState($state)
@@ -90,7 +90,7 @@ class API_OAuth2_Exception_Redirect extends API_OAuth2_Exception_Exception
/**
*
* @param string $redirect_uri
* @param string $redirect_uri
* @return API_OAuth2_Exception_Redirect
*/
public function setRedirect_uri($redirect_uri)

View File

@@ -36,9 +36,9 @@ class API_OAuth2_Exception_Redirect_AccessDenied extends API_OAuth2_Exception_Re
/**
*
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @return API_OAuth2_Exception_Redirect_AccessDenied
*/
public function __construct($redirect_uri, $state = null, $error_uri = null)

View File

@@ -36,9 +36,9 @@ class API_OAuth2_Exception_Redirect_InvalidClient extends API_OAuth2_Exception_R
/**
*
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @return API_OAuth2_Exception_Redirect_InvalidClient
*/
public function __construct($redirect_uri, $state = null, $error_uri = null)

View File

@@ -36,9 +36,9 @@ class API_OAuth2_Exception_Redirect_InvalidRequest extends API_OAuth2_Exception_
/**
*
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @param string $redirect_uri
* @param string $state
* @param string $error_uri
* @return API_OAuth2_Exception_Redirect_InvalidRequest
*/
public function __construct($redirect_uri, $state = null, $error_uri = null)

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