- {{ videoLinkText|trans }}
-
-
\ No newline at end of file
diff --git a/src/Video/AbstractVideo.php b/src/Video/AbstractVideo.php
index c55b08d..29c4b8d 100644
--- a/src/Video/AbstractVideo.php
+++ b/src/Video/AbstractVideo.php
@@ -9,7 +9,6 @@
namespace HeimrichHannot\VideoBundle\Video;
use Contao\StringUtil;
-use ReflectionClass;
abstract class AbstractVideo implements VideoInterface
{
@@ -38,9 +37,6 @@ abstract class AbstractVideo implements VideoInterface
*/
protected $addPlayButton = false;
- /**
- * AbstractVideo constructor.
- */
public function __construct(array $data)
{
$this->setData($data);
@@ -77,34 +73,34 @@ public function getData(): array
{
$result = [];
- $class = new ReflectionClass(static::class);
+ $class = new \ReflectionClass(static::class);
foreach ($class->getMethods() as $method) {
- if ('get' == substr($method->name, 0, 3) && 'getData' !== $method->name) {
+ if (str_starts_with($method->name, 'get') && 'getData' !== $method->name) {
if ($method->isStatic()) {
continue;
}
- $propName = strtolower(substr($method->name, 3, 1)).substr($method->name, 4);
+ $propName = strtolower(substr($method->name, 3, 1)) . substr($method->name, 4);
$result[$propName] = $method->invoke($this);
}
- if ('is' == substr($method->name, 0, 2)) {
+ if (str_starts_with($method->name, 'is')) {
if ($method->isStatic()) {
continue;
}
- $propName = strtolower(substr($method->name, 2, 1)).substr($method->name, 3);
+ $propName = strtolower(substr($method->name, 2, 1)) . substr($method->name, 3);
$result[$propName] = $method->invoke($this);
}
- if ('has' == substr($method->name, 0, 3)) {
+ if (str_starts_with($method->name, 'has')) {
if ($method->isStatic()) {
continue;
}
- $propName = strtolower(substr($method->name, 3, 1)).substr($method->name, 4);
+ $propName = strtolower(substr($method->name, 3, 1)) . substr($method->name, 4);
$result[$propName] = $method->invoke($this);
}
@@ -128,9 +124,6 @@ public function getVideoLinkText(): string
return $this->videoLinkText;
}
- /**
- * {@inheritdoc}
- */
public function getHeadlineText(): string
{
return $this->headlineText;
@@ -145,8 +138,6 @@ public function getAddPlayButton(): bool
* Set object property.
*
* If you overwrite this method, it is recommended to just adjust needed values and call parent::setProperty() afterwards
- *
- * @param $value
*/
protected function setProperty(string $property, $value)
{
diff --git a/src/Video/FileVideo.php b/src/Video/FileVideo.php
index e06b362..68eb36f 100644
--- a/src/Video/FileVideo.php
+++ b/src/Video/FileVideo.php
@@ -8,15 +8,16 @@
namespace HeimrichHannot\VideoBundle\Video;
+use Contao\FilesModel;
use Contao\StringUtil;
use Contao\System;
-use HeimrichHannot\UtilsBundle\File\FileUtil;
-use HeimrichHannot\UtilsBundle\Model\ModelUtil;
+use Contao\Validator;
+use HeimrichHannot\UtilsBundle\Util\Utils;
class FileVideo extends AbstractVideo implements PreviewImageInterface, MultipleSourceVideoInterface, SubtitleInterface
{
- const TYPE = 'file';
- const TEMPLATE = '@HeimrichHannotVideo/videoprovider/videoprovider_file.html.twig';
+ public const TYPE = 'file';
+ public const TEMPLATE = '@HeimrichHannotVideo/videoprovider/videoprovider_file.html.twig';
/**
* @var bool
@@ -48,49 +49,31 @@ class FileVideo extends AbstractVideo implements PreviewImageInterface, Multiple
*/
protected $alternativeText = '';
- /**
- * {@inheritdoc}
- */
public static function getType(): string
{
return self::TYPE;
}
- /**
- * {@inheritdoc}
- */
public static function getTemplate(): string
{
return self::TEMPLATE;
}
- /**
- * {@inheritdoc}
- */
public function hasPreviewImage(): bool
{
return $this->addPreviewImage && \is_string($this->getPreviewImage());
}
- /**
- * {@inheritdoc}
- */
public function getPreviewImage(): ?string
{
return $this->posterSRC;
}
- /**
- * {@inheritdoc}
- */
public static function getPalette(): string
{
return 'videoSRC,videoSubtitles,videoAlternativeText';
}
- /**
- * {@inheritdoc}
- */
public function getSrc(): string
{
$path = $this->prepareVideoSource()[0]['file']->path;
@@ -140,11 +123,14 @@ public function getSubtitles(): array
return [];
}
+ /** @var Utils $utils */
+ $utils = System::getContainer()->get(Utils::class);
+
foreach ($data as $element) {
$subtitles[] = [
- 'src' => System::getContainer()->get(FileUtil::class)->getPathFromUuid($element['file'][0]),
+ 'src' => $utils->file()->getPathFromUuid($element['file'][0]),
'lang' => $element['language'],
- 'label' => System::getLanguages(true)[$element['language']],
+ 'label' => System::getContainer()->get('contao.intl.locales')->getEnabledLocales(null, true)[$element['language']],
];
}
@@ -188,8 +174,11 @@ private function prepareVideoSource(): array
foreach ($data as $video) {
$mediaQuery = $mediaQueryConfig[$video['mediaQuery']]['query'] ?? '';
+ if (Validator::isUuid($video['file'])) {
+ $file = FilesModel::findByUuid($video['file']);
+ }
$videoSrc[] = [
- 'file' => System::getContainer()->get(ModelUtil::class)->getModelInstanceIfId($video['file'], 'tl_files'),
+ 'file' => $file,
'mediaQuery' => $mediaQuery,
];
}
diff --git a/src/Video/PreviewImageInterface.php b/src/Video/PreviewImageInterface.php
index c9db09a..67ff49d 100644
--- a/src/Video/PreviewImageInterface.php
+++ b/src/Video/PreviewImageInterface.php
@@ -17,8 +17,6 @@ public function hasPreviewImage(): bool;
/**
* Return the preview image uuid.
- *
- * @return string
*/
public function getPreviewImage(): ?string;
}
diff --git a/src/Video/VimeoVideo.php b/src/Video/VimeoVideo.php
index a6e7c48..91445d8 100644
--- a/src/Video/VimeoVideo.php
+++ b/src/Video/VimeoVideo.php
@@ -18,57 +18,36 @@ class VimeoVideo extends AbstractVideo implements PreviewImageInterface, NoCooki
protected $posterSRC;
- /**
- * {@inheritdoc}
- */
public static function getType(): string
{
return 'vimeo';
}
- /**
- * {@inheritdoc}
- */
public static function getTemplate(): string
{
return '@HeimrichHannotVideo/videoprovider/videoprovider_vimeo.html.twig';
}
- /**
- * {@inheritdoc}
- */
public static function getPalette(): string
{
return 'vimeo,transcriptedVimeo';
}
- /**
- * {@inheritdoc}
- */
public function hasPreviewImage(): bool
{
return $this->addPreviewImage && \is_string($this->getPreviewImage());
}
- /**
- * {@inheritdoc}
- */
public function getPreviewImage(): ?string
{
return $this->posterSRC;
}
- /**
- * {@inheritdoc}
- */
public function getNoCookieSrc(): string
{
return $this->createUrl(true);
}
- /**
- * {@inheritdoc}
- */
public function getSrc(): string
{
return $this->createUrl(false);
@@ -85,19 +64,19 @@ protected function createUrl(bool $noCookie): string
$queryParams['dnt'] = '1';
}
-// $params = [
-// 'ytShowRelated' => 'rel',
-// 'ytModestBranding' => 'modestbranding',
-// 'ytShowInfo' => 'showinfo',
-// ];
-// foreach ($params as $property => $param) {
-// if ($this->{$property}) {
-// $queryParams[$param] = $this->{$property};
-// }
-// }
-// $queryParams['rel'] = $this->videoShowRelated;
-// $queryParams['modestbranding'] = $this->ytModestBranding;
-// $queryParams['showinfo'] = $this->ytShowInfo;
+ // $params = [
+ // 'ytShowRelated' => 'rel',
+ // 'ytModestBranding' => 'modestbranding',
+ // 'ytShowInfo' => 'showinfo',
+ // ];
+ // foreach ($params as $property => $param) {
+ // if ($this->{$property}) {
+ // $queryParams[$param] = $this->{$property};
+ // }
+ // }
+ // $queryParams['rel'] = $this->videoShowRelated;
+ // $queryParams['modestbranding'] = $this->ytModestBranding;
+ // $queryParams['showinfo'] = $this->ytShowInfo;
if ($this->autoplay) {
$queryParams['autoplay'] = '1';
diff --git a/src/Video/YouTubeVideo.php b/src/Video/YouTubeVideo.php
index 85aad1c..0bee781 100644
--- a/src/Video/YouTubeVideo.php
+++ b/src/Video/YouTubeVideo.php
@@ -10,8 +10,8 @@
class YouTubeVideo extends AbstractVideo implements PreviewImageInterface, NoCookieUrlInterface, ExternalElementInterface
{
- const PRIVACY_EMBED_URL = 'https://www.youtube-nocookie.com/embed/';
- const DEFAULT_EMBED_URL = 'https://www.youtube.com/embed/';
+ public const PRIVACY_EMBED_URL = 'https://www.youtube-nocookie.com/embed/';
+ public const DEFAULT_EMBED_URL = 'https://www.youtube.com/embed/';
/**
* The youtube video id.
@@ -65,9 +65,6 @@ public static function getType(): string
return 'youtube';
}
- /**
- * {@inheritdoc}
- */
public static function getTemplate(): string
{
return '@HeimrichHannotVideo/videoprovider/videoprovider_youtube.html.twig';
@@ -103,41 +100,26 @@ public function getVideoDuration(): string
return $this->videoDuration;
}
- /**
- * @return string
- */
public function getPreviewImage(): ?string
{
return $this->posterSRC;
}
- /**
- * {@inheritdoc}
- */
public function hasPreviewImage(): bool
{
return $this->addPreviewImage && \is_string($this->getPreviewImage());
}
- /**
- * {@inheritdoc}
- */
public function getNoCookieSrc(): string
{
return $this->createUrl(true, $this->youtube);
}
- /**
- * {@inheritdoc}
- */
public function getNoCookieSecondarySrc(): string
{
return $this->createUrl(true, $this->transcriptedYoutube);
}
- /**
- * {@inheritdoc}
- */
public static function getPalette(): string
{
return 'youtube,videoDuration,transcriptedYoutube,ytHd,videoShowRelated,ytModestBranding,ytShowInfo';
@@ -188,7 +170,7 @@ protected function createUrl(bool $noCookie, string $videoId): string
}
if (!empty($queryParams)) {
- $url .= '?'.http_build_query($queryParams);
+ $url .= '?' . http_build_query($queryParams);
}
return $url;
diff --git a/src/Resources/views/videoprovider/videoprovider_default.html.twig b/templates/videoprovider/videoprovider_default.html.twig
similarity index 87%
rename from src/Resources/views/videoprovider/videoprovider_default.html.twig
rename to templates/videoprovider/videoprovider_default.html.twig
index 7cc4c3f..f3def90 100644
--- a/src/Resources/views/videoprovider/videoprovider_default.html.twig
+++ b/templates/videoprovider/videoprovider_default.html.twig
@@ -1,5 +1,7 @@
+{%- import "@ContaoCore/Image/Studio/_macros.html.twig" as studio -%}
+
-
-
-
-
-
-
+
{% block switch %}
{% endblock %}
@@ -7,11 +9,8 @@
{% if previewImage|default() %}
- {% if previewImage.picture|default() %}
- {{ include('@HeimrichHannotContaoUtils/picture.html.twig', previewImage.picture) }}
- {% else %}
- 
- {% endif %}
+ {{ studio.picture(previewImage) }}
+
{% if videoDuration|default() %}
{% if videoDuration matches '/^\\d+$/' %}
diff --git a/src/Resources/views/videoprovider/videoprovider_file.html.twig b/templates/videoprovider/videoprovider_file.html.twig
similarity index 86%
rename from src/Resources/views/videoprovider/videoprovider_file.html.twig
rename to templates/videoprovider/videoprovider_file.html.twig
index ba39eab..c4c6ba4 100644
--- a/src/Resources/views/videoprovider/videoprovider_file.html.twig
+++ b/templates/videoprovider/videoprovider_file.html.twig
@@ -13,7 +13,7 @@
{% endblock %}
{% block videoplayer %}
-
+
{% if multipleSrc|default() %}
{% for video in multipleSrc %}
diff --git a/src/Resources/views/videoprovider/videoprovider_vimeo.html.twig b/templates/videoprovider/videoprovider_vimeo.html.twig
similarity index 100%
rename from src/Resources/views/videoprovider/videoprovider_vimeo.html.twig
rename to templates/videoprovider/videoprovider_vimeo.html.twig
diff --git a/src/Resources/views/videoprovider/videoprovider_youtube.html.twig b/templates/videoprovider/videoprovider_youtube.html.twig
similarity index 100%
rename from src/Resources/views/videoprovider/videoprovider_youtube.html.twig
rename to templates/videoprovider/videoprovider_youtube.html.twig
diff --git a/src/Resources/views/wrapper/videowrapper_default.html.twig b/templates/wrapper/videowrapper_default.html.twig
similarity index 100%
rename from src/Resources/views/wrapper/videowrapper_default.html.twig
rename to templates/wrapper/videowrapper_default.html.twig
diff --git a/src/Resources/translations/messages.de.yml b/translations/messages.de.yml
similarity index 100%
rename from src/Resources/translations/messages.de.yml
rename to translations/messages.de.yml
diff --git a/src/Resources/translations/messages.en.yml b/translations/messages.en.yml
similarity index 100%
rename from src/Resources/translations/messages.en.yml
rename to translations/messages.en.yml
diff --git a/src/Resources/translations/messages.pl.yml b/translations/messages.pl.yml
similarity index 100%
rename from src/Resources/translations/messages.pl.yml
rename to translations/messages.pl.yml
diff --git a/webpack.config.js b/webpack.config.js
index f46afd3..2764001 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,10 +1,10 @@
var Encore = require('@symfony/webpack-encore');
Encore
-.setOutputPath('src/Resources/public/assets/')
-.addEntry('contao-video-bundle', './src/Resources/assets/js/contao-video-bundle.js')
-.addEntry('contao-video-bundle-be', './src/Resources/assets/js/contao-video-bundle-be.js')
-.addEntry('contao-video-bundle-theme', './src/Resources/assets/js/contao-video-bundle-theme.js')
+.setOutputPath('public/assets/')
+.addEntry('contao-video-bundle', './assets/js/contao-video-bundle.js')
+.addEntry('contao-video-bundle-be', './assets/js/contao-video-bundle-be.js')
+.addEntry('contao-video-bundle-theme', './assets/js/contao-video-bundle-theme.js')
.setPublicPath('/bundles/heimrichhannotvideo/assets')
.setManifestKeyPrefix('bundles/heimrichhannotvideo/assets')
.disableSingleRuntimeChunk()
@@ -15,15 +15,6 @@ Encore
return `${moduleFileName}`;
};
})
-.addExternals({
- '@hundh/contao-utils-bundle': 'utilsBundle'
-})
-.configureBabel(null,
-{
- includeNodeModules: [
- '@hundh/contao-utils-bundle',
- ]
-})
.enableSassLoader()
.enablePostCssLoader()
.enableSourceMaps(!Encore.isProduction())