@@ -210,10 +210,10 @@ |
||
| 210 | 210 | return $dbQuery; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - /** |
|
| 214 | - * @param ContainerInterface $container |
|
| 215 | - * @return ListQuery |
|
| 216 | - */ |
|
| 213 | + /** |
|
| 214 | + * @param ContainerInterface $container |
|
| 215 | + * @return ListQuery |
|
| 216 | + */ |
|
| 217 | 217 | public static function factory(ContainerInterface $container) |
| 218 | 218 | { |
| 219 | 219 | return new static($container); |
@@ -25,18 +25,18 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | class FileSender extends AbstractPlugin |
| 27 | 27 | { |
| 28 | - /** |
|
| 29 | - * @var RepositoryService |
|
| 30 | - */ |
|
| 28 | + /** |
|
| 29 | + * @var RepositoryService |
|
| 30 | + */ |
|
| 31 | 31 | private $repositories; |
| 32 | 32 | |
| 33 | - public function __construct(RepositoryService $repositories) |
|
| 34 | - { |
|
| 35 | - $this->repositories = $repositories; |
|
| 36 | - } |
|
| 33 | + public function __construct(RepositoryService $repositories) |
|
| 34 | + { |
|
| 35 | + $this->repositories = $repositories; |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | 38 | |
| 39 | - public function __invoke($repositoryName, $fileId) |
|
| 39 | + public function __invoke($repositoryName, $fileId) |
|
| 40 | 40 | { |
| 41 | 41 | return $this->sendFile($repositoryName, $fileId); |
| 42 | 42 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $response->getHeaders()->addHeaderline('Content-Type', $file->type) |
| 56 | - ->addHeaderline('Content-Length', $file->size); |
|
| 56 | + ->addHeaderline('Content-Length', $file->size); |
|
| 57 | 57 | $response->sendHeaders(); |
| 58 | 58 | |
| 59 | 59 | $resource = $file->getResource(); |
@@ -65,14 +65,14 @@ discard block |
||
| 65 | 65 | return $response; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * @param ContainerInterface $container |
|
| 70 | - * |
|
| 71 | - * @return static |
|
| 72 | - */ |
|
| 68 | + /** |
|
| 69 | + * @param ContainerInterface $container |
|
| 70 | + * |
|
| 71 | + * @return static |
|
| 72 | + */ |
|
| 73 | 73 | static public function factory(ContainerInterface $container) |
| 74 | 74 | { |
| 75 | - $repositories = $container->get('repositories'); |
|
| 76 | - return new static($repositories); |
|
| 75 | + $repositories = $container->get('repositories'); |
|
| 76 | + return new static($repositories); |
|
| 77 | 77 | } |
| 78 | 78 | } |
@@ -44,12 +44,12 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | protected $request; |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * CreatePaginator constructor. |
|
| 49 | - * |
|
| 50 | - * @param ContainerInterface $container |
|
| 51 | - * @param HttpRequest $request |
|
| 52 | - */ |
|
| 47 | + /** |
|
| 48 | + * CreatePaginator constructor. |
|
| 49 | + * |
|
| 50 | + * @param ContainerInterface $container |
|
| 51 | + * @param HttpRequest $request |
|
| 52 | + */ |
|
| 53 | 53 | public function __construct(ContainerInterface $container, HttpRequest $request) |
| 54 | 54 | { |
| 55 | 55 | $this->serviceManager = $container->get('ServiceManager'); |
@@ -105,9 +105,9 @@ discard block |
||
| 105 | 105 | /* @var \Core\EventManager\EventManager $events */ |
| 106 | 106 | /* @var \Zend\Paginator\Paginator $paginator */ |
| 107 | 107 | /* @var CreatePaginatorEvent $event */ |
| 108 | - $events = $this->serviceManager->get('Core/CreatePaginator/Events'); |
|
| 108 | + $events = $this->serviceManager->get('Core/CreatePaginator/Events'); |
|
| 109 | 109 | |
| 110 | - $event = $events->getEvent(CreatePaginatorEvent::EVENT_CREATE_PAGINATOR,$this,[ |
|
| 110 | + $event = $events->getEvent(CreatePaginatorEvent::EVENT_CREATE_PAGINATOR,$this,[ |
|
| 111 | 111 | 'paginatorParams' => $params, |
| 112 | 112 | 'paginators' => $paginators, |
| 113 | 113 | 'paginatorName' => $paginatorName |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | $paginator = $paginators->get($paginatorName,$params); |
| 122 | 122 | } |
| 123 | 123 | $paginator->setCurrentPageNumber(isset($params['page']) ? $params['page'] : 1) |
| 124 | - ->setItemCountPerPage(isset($params['count']) ? $params['count'] : 10) |
|
| 125 | - ->setPageRange(isset($params['range']) ? $params['range'] : 5); |
|
| 124 | + ->setItemCountPerPage(isset($params['count']) ? $params['count'] : 10) |
|
| 125 | + ->setPageRange(isset($params['range']) ? $params['range'] : 5); |
|
| 126 | 126 | |
| 127 | 127 | return $paginator; |
| 128 | 128 | } |
@@ -20,22 +20,22 @@ |
||
| 20 | 20 | |
| 21 | 21 | class EntitySnapshotFactory implements FactoryInterface |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @param ContainerInterface $container |
|
| 25 | - * @param string $requestedName |
|
| 26 | - * @param array|null $options |
|
| 27 | - * |
|
| 28 | - * @return EntitySnapshot |
|
| 29 | - */ |
|
| 30 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 31 | - { |
|
| 32 | - $entitySnapshotPlugin = new EntitySnapshot(); |
|
| 33 | - // @TODO actually we just need... |
|
| 34 | - // an access to all options defining an Snapshot-Generator |
|
| 35 | - // the Hydrator-Manager |
|
| 36 | - $entitySnapshotPlugin->setServiceLocator($container); |
|
| 37 | - $repositories = $container->get('repositories'); |
|
| 38 | - $entitySnapshotPlugin->setRepositories($repositories); |
|
| 39 | - return $entitySnapshotPlugin; |
|
| 40 | - } |
|
| 23 | + /** |
|
| 24 | + * @param ContainerInterface $container |
|
| 25 | + * @param string $requestedName |
|
| 26 | + * @param array|null $options |
|
| 27 | + * |
|
| 28 | + * @return EntitySnapshot |
|
| 29 | + */ |
|
| 30 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 31 | + { |
|
| 32 | + $entitySnapshotPlugin = new EntitySnapshot(); |
|
| 33 | + // @TODO actually we just need... |
|
| 34 | + // an access to all options defining an Snapshot-Generator |
|
| 35 | + // the Hydrator-Manager |
|
| 36 | + $entitySnapshotPlugin->setServiceLocator($container); |
|
| 37 | + $repositories = $container->get('repositories'); |
|
| 38 | + $entitySnapshotPlugin->setRepositories($repositories); |
|
| 39 | + return $entitySnapshotPlugin; |
|
| 40 | + } |
|
| 41 | 41 | } |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | |
| 51 | 51 | public function init() |
| 52 | 52 | { |
| 53 | - $this->setName('items'); |
|
| 53 | + $this->setName('items'); |
|
| 54 | 54 | $this->add([ |
| 55 | 55 | 'type' => 'Collection', |
| 56 | 56 | 'name' => 'items', |
@@ -79,87 +79,87 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | protected $options; |
| 81 | 81 | |
| 82 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
| 83 | - /* @var $formElementManager \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 84 | - $formElementManager = $container->get('FormElementManager'); |
|
| 85 | - $options=null; |
|
| 86 | - if ($this->options) { |
|
| 87 | - $options = $container->get($this->options); |
|
| 88 | - } |
|
| 82 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
| 83 | + /* @var $formElementManager \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 84 | + $formElementManager = $container->get('FormElementManager'); |
|
| 85 | + $options=null; |
|
| 86 | + if ($this->options) { |
|
| 87 | + $options = $container->get($this->options); |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - // Retrieve configuration. |
|
| 91 | - if ($this->configKey) { |
|
| 92 | - $config = $container->get('config'); |
|
| 93 | - $config = isset($config['form_elements_config']['file_upload_factories'][$this->configKey]) |
|
| 94 | - ? $config['form_elements_config']['file_upload_factories'][$this->configKey] |
|
| 95 | - : array(); |
|
| 96 | - $this->config = $config; |
|
| 97 | - } |
|
| 90 | + // Retrieve configuration. |
|
| 91 | + if ($this->configKey) { |
|
| 92 | + $config = $container->get('config'); |
|
| 93 | + $config = isset($config['form_elements_config']['file_upload_factories'][$this->configKey]) |
|
| 94 | + ? $config['form_elements_config']['file_upload_factories'][$this->configKey] |
|
| 95 | + : array(); |
|
| 96 | + $this->config = $config; |
|
| 97 | + } |
|
| 98 | 98 | |
| 99 | 99 | |
| 100 | - $form = new Form(); |
|
| 101 | - $formElementManager->injectFactory($formElementManager,$form); |
|
| 102 | - $form->add( |
|
| 103 | - array( |
|
| 104 | - 'type' => $this->fileElement, |
|
| 105 | - 'name' => $this->fileName, |
|
| 106 | - 'options' => array( |
|
| 107 | - /* @TODO: [ZF3] set this value to false will make upload field invisible in organization and user profile profile */ |
|
| 108 | - 'use_formrow_helper' => true, |
|
| 109 | - ), |
|
| 110 | - 'attributes' => array( |
|
| 111 | - 'class' => 'hide', |
|
| 112 | - ), |
|
| 113 | - ) |
|
| 114 | - ); |
|
| 115 | - /* @var $element \Core\Form\Element\FileUpload */ |
|
| 116 | - $element = $form->get($this->fileName); |
|
| 117 | - $element->setIsMultiple($this->multiple); |
|
| 100 | + $form = new Form(); |
|
| 101 | + $formElementManager->injectFactory($formElementManager,$form); |
|
| 102 | + $form->add( |
|
| 103 | + array( |
|
| 104 | + 'type' => $this->fileElement, |
|
| 105 | + 'name' => $this->fileName, |
|
| 106 | + 'options' => array( |
|
| 107 | + /* @TODO: [ZF3] set this value to false will make upload field invisible in organization and user profile profile */ |
|
| 108 | + 'use_formrow_helper' => true, |
|
| 109 | + ), |
|
| 110 | + 'attributes' => array( |
|
| 111 | + 'class' => 'hide', |
|
| 112 | + ), |
|
| 113 | + ) |
|
| 114 | + ); |
|
| 115 | + /* @var $element \Core\Form\Element\FileUpload */ |
|
| 116 | + $element = $form->get($this->fileName); |
|
| 117 | + $element->setIsMultiple($this->multiple); |
|
| 118 | 118 | |
| 119 | - $user = $container->get('AuthenticationService')->getUser(); |
|
| 119 | + $user = $container->get('AuthenticationService')->getUser(); |
|
| 120 | 120 | |
| 121 | - if (isset($this->config['hydrator']) && $this->config['hydrator']) { |
|
| 122 | - /** @noinspection PhpUndefinedVariableInspection */ |
|
| 123 | - $hydrator = $container->get('HydratorManager')->get($this->config['hydrator']); |
|
| 124 | - } else { |
|
| 125 | - /* @var $fileEntity \Core\Entity\FileInterface */ |
|
| 126 | - $fileEntity = new $this->fileEntityClass(); |
|
| 127 | - if ($user instanceof AnonymousUser) { |
|
| 128 | - $fileEntity->getPermissions()->grant($user, 'all'); |
|
| 129 | - } else { |
|
| 130 | - $fileEntity->setUser($user); |
|
| 131 | - } |
|
| 121 | + if (isset($this->config['hydrator']) && $this->config['hydrator']) { |
|
| 122 | + /** @noinspection PhpUndefinedVariableInspection */ |
|
| 123 | + $hydrator = $container->get('HydratorManager')->get($this->config['hydrator']); |
|
| 124 | + } else { |
|
| 125 | + /* @var $fileEntity \Core\Entity\FileInterface */ |
|
| 126 | + $fileEntity = new $this->fileEntityClass(); |
|
| 127 | + if ($user instanceof AnonymousUser) { |
|
| 128 | + $fileEntity->getPermissions()->grant($user, 'all'); |
|
| 129 | + } else { |
|
| 130 | + $fileEntity->setUser($user); |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - $strategy = new FileUploadStrategy($fileEntity); |
|
| 134 | - if ($this->multiple) { |
|
| 135 | - $hydrator = new FileCollectionUploadHydrator($this->fileName, $strategy); |
|
| 136 | - $form->add( |
|
| 137 | - array( |
|
| 138 | - 'type' => 'button', |
|
| 139 | - 'name' => 'remove', |
|
| 140 | - 'options' => array( |
|
| 141 | - 'label' => /*@translate*/ 'Remove all', |
|
| 142 | - ), |
|
| 143 | - 'attributes' => array( |
|
| 144 | - 'class' => 'fu-remove-all btn btn-danger btn-xs pull-right' |
|
| 145 | - ), |
|
| 146 | - ) |
|
| 147 | - ); |
|
| 148 | - } else { |
|
| 149 | - $hydrator = new EntityHydrator(); |
|
| 150 | - $hydrator->addStrategy($this->fileName, $strategy); |
|
| 151 | - } |
|
| 152 | - } |
|
| 133 | + $strategy = new FileUploadStrategy($fileEntity); |
|
| 134 | + if ($this->multiple) { |
|
| 135 | + $hydrator = new FileCollectionUploadHydrator($this->fileName, $strategy); |
|
| 136 | + $form->add( |
|
| 137 | + array( |
|
| 138 | + 'type' => 'button', |
|
| 139 | + 'name' => 'remove', |
|
| 140 | + 'options' => array( |
|
| 141 | + 'label' => /*@translate*/ 'Remove all', |
|
| 142 | + ), |
|
| 143 | + 'attributes' => array( |
|
| 144 | + 'class' => 'fu-remove-all btn btn-danger btn-xs pull-right' |
|
| 145 | + ), |
|
| 146 | + ) |
|
| 147 | + ); |
|
| 148 | + } else { |
|
| 149 | + $hydrator = new EntityHydrator(); |
|
| 150 | + $hydrator->addStrategy($this->fileName, $strategy); |
|
| 151 | + } |
|
| 152 | + } |
|
| 153 | 153 | |
| 154 | - $form->setHydrator($hydrator); |
|
| 155 | - $form->setOptions(array('use_files_array' => true)); |
|
| 154 | + $form->setHydrator($hydrator); |
|
| 155 | + $form->setOptions(array('use_files_array' => true)); |
|
| 156 | 156 | |
| 157 | - $this->configureForm($form, $options); |
|
| 158 | - return $form; |
|
| 159 | - } |
|
| 157 | + $this->configureForm($form, $options); |
|
| 158 | + return $form; |
|
| 159 | + } |
|
| 160 | 160 | |
| 161 | 161 | |
| 162 | - /** |
|
| 162 | + /** |
|
| 163 | 163 | * The configuration from the FileUploadFactory configuration |
| 164 | 164 | * |
| 165 | 165 | * @param ServiceLocatorInterface $serviceLocator |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | */ |
| 168 | 168 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 169 | 169 | { |
| 170 | - return $this($serviceLocator,static::class); |
|
| 170 | + return $this($serviceLocator,static::class); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -24,31 +24,31 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | class InjectHeadscriptInitializer implements InitializerInterface |
| 26 | 26 | { |
| 27 | - public function __invoke( ContainerInterface $container, $instance ) { |
|
| 28 | - /* @var $serviceLocator \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 27 | + public function __invoke( ContainerInterface $container, $instance ) { |
|
| 28 | + /* @var $serviceLocator \Zend\Form\FormElementManager\FormElementManagerV3Polyfill */ |
|
| 29 | 29 | |
| 30 | - if (!$instance instanceof HeadscriptProviderInterface) { |
|
| 31 | - return; |
|
| 32 | - } |
|
| 30 | + if (!$instance instanceof HeadscriptProviderInterface) { |
|
| 31 | + return; |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - $scripts = $instance->getHeadscripts(); |
|
| 34 | + $scripts = $instance->getHeadscripts(); |
|
| 35 | 35 | |
| 36 | - if (!is_array($scripts) || empty($scripts)) { |
|
| 37 | - return; |
|
| 38 | - } |
|
| 36 | + if (!is_array($scripts) || empty($scripts)) { |
|
| 37 | + return; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /* @var $basepath \Zend\View\Helper\BasePath |
|
| 40 | + /* @var $basepath \Zend\View\Helper\BasePath |
|
| 41 | 41 | * @var $headscript \Zend\View\Helper\HeadScript */ |
| 42 | - $helpers = $container->get('ViewHelperManager'); |
|
| 43 | - $basepath = $helpers->get('basepath'); |
|
| 44 | - $headscript = $helpers->get('headscript'); |
|
| 42 | + $helpers = $container->get('ViewHelperManager'); |
|
| 43 | + $basepath = $helpers->get('basepath'); |
|
| 44 | + $headscript = $helpers->get('headscript'); |
|
| 45 | 45 | |
| 46 | - foreach ($scripts as $script) { |
|
| 47 | - $headscript->appendFile($basepath($script)); |
|
| 48 | - } |
|
| 49 | - } |
|
| 46 | + foreach ($scripts as $script) { |
|
| 47 | + $headscript->appendFile($basepath($script)); |
|
| 48 | + } |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 51 | + /** |
|
| 52 | 52 | * Injects scripts to the headscript view helper. |
| 53 | 53 | * |
| 54 | 54 | * If the created instance implements {@link HeadscriptProviderInterface}, |
@@ -21,15 +21,15 @@ |
||
| 21 | 21 | */ |
| 22 | 22 | class Initializer implements InitializerInterface |
| 23 | 23 | { |
| 24 | - public function __invoke( ContainerInterface $container, $instance ) |
|
| 25 | - { |
|
| 26 | - if ($instance instanceof FormContainer) { |
|
| 27 | - $instance->setFormElementManager($container->get('FormElementManager')); |
|
| 28 | - } |
|
| 29 | - } |
|
| 24 | + public function __invoke( ContainerInterface $container, $instance ) |
|
| 25 | + { |
|
| 26 | + if ($instance instanceof FormContainer) { |
|
| 27 | + $instance->setFormElementManager($container->get('FormElementManager')); |
|
| 28 | + } |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | 31 | |
| 32 | - /** |
|
| 32 | + /** |
|
| 33 | 33 | * @see \Zend\ServiceManager\InitializerInterface::initialize() |
| 34 | 34 | */ |
| 35 | 35 | public function initialize($instance, ServiceLocatorInterface $serviceLocator) |
@@ -328,11 +328,11 @@ |
||
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | // @TODO: [ZF3] which one is correct? $form[options][label] or $form[options] |
| 331 | - if(isset($form['label'])){ |
|
| 332 | - $formLabel = $form['label']; |
|
| 333 | - }elseif(isset($form['options']['label'])){ |
|
| 334 | - $formLabel = $form['options']['label']; |
|
| 335 | - } |
|
| 331 | + if(isset($form['label'])){ |
|
| 332 | + $formLabel = $form['label']; |
|
| 333 | + }elseif(isset($form['options']['label'])){ |
|
| 334 | + $formLabel = $form['options']['label']; |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | 337 | if (isset($formLabel)) { |
| 338 | 338 | $formInstance->setLabel($formLabel); |