Skip to content

Commit

Permalink
Merge pull request #167 from esmero/ISSUE-164
Browse files Browse the repository at this point in the history
ISSUE-164:Change master request from symfony (was never there) to the shim
  • Loading branch information
DiegoPino authored May 27, 2023
2 parents ddbccb2 + c5e4704 commit ae8db27
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
1 change: 1 addition & 0 deletions src/Form/amiSetEntityReportForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$logfilename = $this->fileSystem->realpath($logfilename);
$last_op = NULL;
if ($logfilename !== FALSE && file_exists($logfilename)) {
clearstatcache(TRUE, $logfilename);
// How many lines?
$file = new \SplFileObject($logfilename, 'r');
$file->seek(PHP_INT_MAX);
Expand Down
12 changes: 1 addition & 11 deletions src/Plugin/facets/processor/VboBatchProcessorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
* {@inheritdoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
if (method_exists(SymfonyRequestStack::class, 'getMainRequest')) {
if (method_exists($container->get('request_stack'), 'getMainRequest')) {
$request = $container->get('request_stack')->getMainRequest();
}
else {
Expand All @@ -185,16 +185,6 @@ public static function create(ContainerInterface $container, array $configuratio
$container->get('current_user'),
$container->get('entity_type.manager'),
);

return new static(
$configuration,
$plugin_id,
$plugin_definition,
$container->get('request_stack')->getMainRequest(),
$container->get('tempstore.private'),
$container->get('current_user'),
$container->get('entity_type.manager'),
);
}

/**
Expand Down

0 comments on commit ae8db27

Please sign in to comment.