Skip to content

Commit 6538535

Browse files
AngelFQCAngelFQC
committed
Minor: Format code
1 parent 6ee2bda commit 6538535

File tree

10 files changed

+40
-48
lines changed

10 files changed

+40
-48
lines changed

‎src/CoreBundle/Controller/Admin/AdminController.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ public function listFilesInfo(
114114
// Avoid duplicates for the same course.
115115
if (!isset($coursesForThisFile[$courseId])) {
116116
$coursesForThisFile[$courseId] = [
117-
'id' => $courseId,
118-
'code' => $course->getCode(),
119-
'title' => $course->getTitle(),
117+
'id' => $courseId,
118+
'code' => $course->getCode(),
119+
'title' => $course->getTitle(),
120120
'resourceNodeId' => $courseResourceNodeId,
121121
];
122122
}
@@ -144,22 +144,22 @@ public function listFilesInfo(
144144
$courseResourceNodeId = $courseResourceNode ? $courseResourceNode->getId() : null;
145145

146146
$courseOptions[] = [
147-
'id' => $course->getId(),
148-
'code' => $course->getCode(),
149-
'title' => $course->getTitle(),
147+
'id' => $course->getId(),
148+
'code' => $course->getCode(),
149+
'title' => $course->getTitle(),
150150
'resourceNodeId' => $courseResourceNodeId,
151151
];
152152
}
153153

154154
return $this->render('@ChamiloCore/Admin/files_info.html.twig', [
155-
'files' => $files,
156-
'fileUrls' => $fileUrls,
157-
'filePaths' => $filePaths,
158-
'totalPages' => $totalPages,
159-
'currentPage' => $page,
160-
'search' => $search,
161-
'orphanFlags' => $orphanFlags,
162-
'linksCount' => $linksCount,
155+
'files' => $files,
156+
'fileUrls' => $fileUrls,
157+
'filePaths' => $filePaths,
158+
'totalPages' => $totalPages,
159+
'currentPage' => $page,
160+
'search' => $search,
161+
'orphanFlags' => $orphanFlags,
162+
'linksCount' => $linksCount,
163163
'coursesByFile' => $coursesByFile,
164164
'courseOptions' => $courseOptions,
165165
]);
@@ -315,7 +315,7 @@ public function attachOrphanFileToCourse(
315315
'File "%s" has been attached to %d course(s): %s.',
316316
(string) ($resourceFile->getOriginalName() ?? $resourceFile->getTitle() ?? $resourceFile->getId()),
317317
\count($attachedTitles),
318-
\implode(', ', $attachedTitles)
318+
implode(', ', $attachedTitles)
319319
)
320320
);
321321
}
@@ -325,7 +325,7 @@ public function attachOrphanFileToCourse(
325325
'warning',
326326
\sprintf(
327327
'Some courses were skipped: %s.',
328-
\implode(', ', $skippedTitles)
328+
implode(', ', $skippedTitles)
329329
)
330330
);
331331
}
@@ -399,7 +399,7 @@ public function detachFileFromCourse(
399399

400400
$this->addFlash(
401401
'success',
402-
sprintf(
402+
\sprintf(
403403
'File has been detached from %d course link(s).',
404404
$removed
405405
)

‎src/CoreBundle/Controller/Api/DownloadSelectedDocumentsAction.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(
2929
private readonly KernelInterface $kernel,
3030
private readonly ResourceNodeRepository $resourceNodeRepository,
3131
private readonly CDocumentRepository $documentRepo,
32-
) { }
32+
) {}
3333

3434
/**
3535
* @throws Exception

‎src/CoreBundle/Controller/ResourceController.php‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@
1212
use Chamilo\CoreBundle\Entity\ResourceNode;
1313
use Chamilo\CoreBundle\Entity\Session;
1414
use Chamilo\CoreBundle\Entity\User;
15-
use Chamilo\CoreBundle\Helpers\AccessUrlHelper;
1615
use Chamilo\CoreBundle\Helpers\ResourceFileHelper;
1716
use Chamilo\CoreBundle\Helpers\UserHelper;
1817
use Chamilo\CoreBundle\Repository\ResourceFileRepository;
1918
use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
2019
use Chamilo\CoreBundle\Repository\ResourceWithLinkInterface;
2120
use Chamilo\CoreBundle\Repository\TrackEDownloadsRepository;
2221
use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
23-
use Chamilo\CoreBundle\Settings\SettingsManager;
2422
use Chamilo\CoreBundle\Tool\ToolChain;
2523
use Chamilo\CoreBundle\Traits\ControllerTrait;
2624
use Chamilo\CoreBundle\Traits\CourseControllerTrait;
@@ -50,6 +48,8 @@
5048
use ZipStream\Option\Archive;
5149
use ZipStream\ZipStream;
5250

51+
use const PHP_EOL;
52+
5353
/**
5454
* @author Julio Montoya <gugli100@gmail.com>.
5555
*/
@@ -716,7 +716,6 @@ private function injectGlossaryJs(
716716
return $content.$jsConfig;
717717
}
718718

719-
720719
/**
721720
* Normalize generated HTML documents coming from templates/editors.
722721
*
@@ -733,9 +732,9 @@ private function normalizeGeneratedHtml(string $content): string
733732
$upper = strtoupper($content);
734733

735734
$firstHeadStart = stripos($upper, '<HEAD');
736-
$firstHeadEnd = stripos($upper, '</HEAD>');
737-
$doctypePos = stripos($upper, '<!DOCTYPE');
738-
$htmlPos = stripos($upper, '<HTML');
735+
$firstHeadEnd = stripos($upper, '</HEAD>');
736+
$doctypePos = stripos($upper, '<!DOCTYPE');
737+
$htmlPos = stripos($upper, '<HTML');
739738

740739
// If we do not have the pattern <head>...</head> before <!DOCTYPE html>, do nothing.
741740
if (false === $firstHeadStart || false === $firstHeadEnd || false === $doctypePos) {
@@ -748,8 +747,8 @@ private function normalizeGeneratedHtml(string $content): string
748747
}
749748

750749
// Extract the first <head>...</head> block (including tags).
751-
$headBlockLength = $firstHeadEnd + strlen('</head>') - $firstHeadStart;
752-
$headBlock = substr($content, $firstHeadStart, $headBlockLength);
750+
$headBlockLength = $firstHeadEnd + \strlen('</head>') - $firstHeadStart;
751+
$headBlock = substr($content, $firstHeadStart, $headBlockLength);
753752

754753
// Remove that first <head> block from the beginning part.
755754
// Everything from <!DOCTYPE ...> will be treated as the "real" document.
@@ -784,11 +783,8 @@ private function normalizeGeneratedHtml(string $content): string
784783

785784
$insertionPos = $secondHeadTagEnd + 1;
786785

787-
$normalized =
788-
substr($baseDoc, 0, $insertionPos)
786+
return substr($baseDoc, 0, $insertionPos)
789787
.PHP_EOL.$innerHead.PHP_EOL
790788
.substr($baseDoc, $insertionPos);
791-
792-
return $normalized;
793789
}
794790
}

‎src/CoreBundle/Entity/Portfolio.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace Chamilo\CoreBundle\Entity;
88

9-
use Chamilo\CoreBundle\Traits\UserTrait;
109
use Doctrine\Common\Collections\ArrayCollection;
1110
use Doctrine\Common\Collections\Collection;
1211
use Doctrine\Common\Collections\Criteria;

‎src/CoreBundle/Enums/ObjectIcon.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,4 @@ enum ObjectIcon: string
158158
case EVENT_REMINDER = 'alarm';
159159
// Question icon
160160
case QUESTION = 'comment-question-outline';
161-
162161
}

‎src/CoreBundle/Framework/Container.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -706,16 +706,12 @@ public static function getEventDispatcher(): EventDispatcherInterface
706706
public static function getPortfolioRepository(): PortfolioRepository
707707
{
708708
/** @var PortfolioRepository $repo */
709-
$repo = self::$container->get(PortfolioRepository::class);
710-
711-
return $repo;
709+
return self::$container->get(PortfolioRepository::class);
712710
}
713711

714712
public static function getPortfolioCategoryHelper(): PortfolioCategoryHelper
715713
{
716714
/** @var PortfolioCategoryHelper $helper */
717-
$helper = self::$container->get(PortfolioCategoryHelper::class);
718-
719-
return $helper;
715+
return self::$container->get(PortfolioCategoryHelper::class);
720716
}
721717
}

‎src/CoreBundle/Helpers/PortfolioCategoryHelper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ public function getListForIndex(
4242

4343
return $this->categoryRepo->findBy($categoriesCriteria);
4444
}
45-
}
45+
}

‎src/CoreBundle/Helpers/ResourceFileHelper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ResourceFileHelper
1515
public function __construct(
1616
private readonly SettingsManager $settingsManager,
1717
private readonly AccessUrlHelper $accessUrlHelper,
18-
){}
18+
) {}
1919

2020
public function resolveResourceFileByAccessUrl(ResourceNode $resourceNode): ?ResourceFile
2121
{
@@ -41,4 +41,4 @@ public function resolveResourceFileByAccessUrl(ResourceNode $resourceNode): ?Res
4141

4242
return $resourceFile;
4343
}
44-
}
44+
}

‎src/CoreBundle/Repository/Node/PortfolioRepository.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
use Chamilo\CoreBundle\Entity\Session;
1414
use Chamilo\CoreBundle\Entity\User;
1515
use Chamilo\CoreBundle\Repository\ResourceRepository;
16+
use DateTime;
1617
use Doctrine\ORM\Query\Expr\Join;
1718
use Doctrine\Persistence\ManagerRegistry;
1819

1920
class PortfolioRepository extends ResourceRepository
2021
{
21-
public function __construct(ManagerRegistry $registry) {
22+
public function __construct(ManagerRegistry $registry)
23+
{
2224
parent::__construct($registry, Portfolio::class);
2325
}
2426

@@ -51,7 +53,7 @@ public function findTemplates(User $creator, ?Course $course, ?Session $session)
5153
$this->addCreatorQueryBuilder($creator, $qb);
5254

5355
return $qb
54-
->andWhere($qb->expr()->eq('resource.isTemplate',true))
56+
->andWhere($qb->expr()->eq('resource.isTemplate', true))
5557
->getQuery()
5658
->getResult()
5759
;
@@ -64,7 +66,7 @@ public function getIndexCourseItems(
6466
?Session $session = null,
6567
bool $showBaseContentInSession = false,
6668
bool $listByUser = false,
67-
?\DateTime $date = null,
69+
?DateTime $date = null,
6870
array $tags = [],
6971
?string $searchText = null,
7072
array $searchCategories = [],
@@ -97,7 +99,8 @@ public function getIndexCourseItems(
9799
->innerJoin(ExtraField::class, 'ef', Join::WITH, 'ef.id = efrt.fieldId')
98100
->andWhere('ef.extraFieldType = :efType')
99101
->andWhere('ef.variable = :variable')
100-
->andWhere('efrt.tagId IN (:tags)');
102+
->andWhere('efrt.tagId IN (:tags)')
103+
;
101104

102105
$queryBuilder->setParameter('efType', ExtraField::PORTFOLIO_TYPE);
103106
$queryBuilder->setParameter('variable', 'tags');
@@ -128,7 +131,8 @@ public function getIndexCourseItems(
128131
if ($listByUser) {
129132
$queryBuilder
130133
->andWhere('resource.user = :user')
131-
->setParameter('user', $owner);
134+
->setParameter('user', $owner)
135+
;
132136
}
133137

134138
if ($advancedSharingEnabled) {

‎src/CoreBundle/Traits/ControllerTrait.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
use Sylius\Bundle\SettingsBundle\Form\Factory\SettingsFormFactory;
3636
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
3737
use Symfony\Component\HttpFoundation\Request;
38-
use Symfony\Component\HttpFoundation\Response;
39-
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
4038
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
4139
use Symfony\Contracts\Translation\TranslatorInterface;
4240

0 commit comments

Comments
 (0)