Bug fixes and other minor improvements

.appveyor.yml

@@ -18,16 +18,12 @@ environment:
 
   shaka_packager_download: https://github.com/google/shaka-packager/releases/download/v2.3.0/packager-win.exe
 
-  matrix:
-    - PHP_VERSION: 7.1
-    - PHP_VERSION: 7.2
-
 init:
   - ps: $env:PATH = 'c:\tools\php;c:\ProgramData\ComposerSetup\bin;' + $env:PATH
 
 install:
   - ps: Set-Service wuauserv -StartupType Manual # Chocolatey will try to install Windows updates when installing PHP.
-  - ps: appveyor-retry cinst --no-progress --params '""/InstallDir:c:\tools\php""' -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:PHP_VERSION | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+  - ps: cinst php --params '""/InstallDir:C:\tools\php""' --ignore-checksums
   - ps: Start-FileDownload $env:shaka_packager_download
 
   - ren packager-win.exe packager.exe

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,16 +23,9 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Local machine (please complete the following information):**
+ - OS: [e.g. Linux]
+ - Packager [e.g. 2.3]
 
 **Additional context**
 Add any other context about the problem here.

.travis.yml

@@ -13,8 +13,8 @@ cache:
     - $HOME/.cache
 
 php:
-  - 7.1
   - 7.2
+  - 7.3
 
 
 before_install:

SECURITY.md

@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+You can use these versions of required libraries that are currently being supported with security updates.
+
+| Version              | Supported          |
+| -------------------- | ------------------ |
+| PHP > 7.2.x          | :white_check_mark: |
+| Packager > 2.3.x     | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability within this package, please send an e-mail to Amin Yazdanpanah via: contact [AT] aminyazdanpanah • com.

composer.json

@@ -14,11 +14,11 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "symfony/process": "^4.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "8.3.4"
     },
     "autoload": {
         "files": [

examples/adInsertion/HLS_transport_streams.php

@@ -1,13 +1,13 @@
 <?php
 
 /**
-=========================================================
-Single file MP4 output + ad
-=========================================================
-The example below uses the H264 streams created in Media Encoding.
-
-The example below creates five single track TS streams
-(4 video, 1 audio) and HLS playlists, which describe the streams.
+ * =========================================================
+ * Single file MP4 output + ad
+ * =========================================================
+ * The example below uses the H264 streams created in Media Encoding.
+ *
+ * The example below creates five single track TS streams
+ * (4 video, 1 audio) and HLS playlists, which describe the streams.
 */
 
 use Shaka\Options\Streams\HLSStream;

examples/adInsertion/dash_on-demand.php

@@ -1,16 +1,15 @@
 <?php
 
 /**
-=========================================================
-on-demand + ad
-=========================================================
-The example below uses the H264 streams created in Media Encoding.
-It can be applied to VP9 in the same way.
-
-The below example creates five single track fragmented mp4
-streams (4 video, 1 audio), a subtitle file and a manifest, which
-describes the streams.
-*/
+ * =========================================================
+ * on-demand + ad
+ * =========================================================
+ * The example below uses the H264 streams created in Media Encoding.
+ * It can be applied to VP9 in the same way.
+ * The below example creates five single track fragmented mp4
+ * streams (4 video, 1 audio), a subtitle file and a manifest, which
+ * describes the streams.
+ */
 
 use Shaka\Options\Streams\DASHStream;
 

examples/adInsertion/dash_on-demand_one_file_per_period.php

@@ -1,15 +1,15 @@
 <?php
 
 /**
-=========================================================
-on-demand + one file per period + ad
-=========================================================
-The example below uses the H264 streams created in Media Encoding.
-It can be applied to VP9 in the same way.
-
-The below example creates five single track fragmented mp4
-streams (4 video, 1 audio), a subtitle file and a manifest, which
-describes the streams.
+ * =========================================================
+ * on-demand + one file per period + ad
+ * =========================================================
+ * The example below uses the H264 streams created in Media Encoding.
+ * It can be applied to VP9 in the same way.
+ *
+ * The below example creates five single track fragmented mp4
+ * streams (4 video, 1 audio), a subtitle file and a manifest, which
+ * describes the streams.
 */
 
 use Shaka\Options\Streams\DASHStream;

examples/adInsertion/dash_static-live.php

@@ -1,12 +1,12 @@
 <?php
 
 /**
-=========================================================
-static-live + ad
-=========================================================
-The example below creates five groups of segments
-(each with an init segment and a series of media segments)
-for the five streams and a manifest, which describes the streams.
+ * =========================================================
+ * static-live + ad
+ * =========================================================
+ * The example below creates five groups of segments
+ * (each with an init segment and a series of media segments)
+ * for the five streams and a manifest, which describes the streams.
 */
 
 use Shaka\Options\Streams\DASHStream;

examples/basic/basic_transmuxing.php

@@ -1,15 +1,15 @@
 <?php
 
 /**
-=========================================================
-Basic transmuxing
-=========================================================
-Shaka Packager can be used to extract streams, optionally
-transmuxes the streams from one container format to another
-container format.
-
-Here is a simple example that extracts video and audio from
-the input file
+ * =========================================================
+ * Basic transmuxing
+ * =========================================================
+ * Shaka Packager can be used to extract streams, optionally
+ * transmuxes the streams from one container format to another
+ * container format.
+ *
+ * Here is a simple example that extracts video and audio from
+ * the input file
 */
 
 use Shaka\Options\Streams\Stream;

examples/basic/media_file_analysis.php

@@ -1,11 +1,11 @@
 <?php
 
 /**
-=========================================================
-Media file analysis
-=========================================================
-Shaka Packager can be used to inspect the content of a
-media file and dump basic stream information
+ * =========================================================
+ * Media file analysis
+ * =========================================================
+ * Shaka Packager can be used to inspect the content of a
+ * media file and dump basic stream information
 */
 
 use Shaka\Options\Streams\Stream;

examples/dash/on-demand.php

@@ -1,15 +1,15 @@
 <?php
 
 /**
-=========================================================
-on-demand
-=========================================================
-The example below uses the H264 streams created in Media Encoding.
-It can be applied to VP9 in the same way.
-
-The below example creates five single track fragmented mp4
-streams (4 video, 1 audio), a subtitle file and a manifest, which
-describes the streams.
+ * =========================================================
+ * on-demand
+ * =========================================================
+ * The example below uses the H264 streams created in Media Encoding.
+ * It can be applied to VP9 in the same way.
+ *
+ * The below example creates five single track fragmented mp4
+ * streams (4 video, 1 audio), a subtitle file and a manifest, which
+ * describes the streams.
 */
 
 use Shaka\Options\Streams\DASHStream;

examples/dash/on-demand_with_trick-play_tracks.php

@@ -1,11 +1,11 @@
 <?php
 
 /**
-=========================================================
-on-demand with trick-play tracks
-=========================================================
-The example below creates two extra trick play tracks,
-besides the files genereated with the on-demand example.
+ * =========================================================
+ * on-demand with trick-play tracks
+ * =========================================================
+ * The example below creates two extra trick play tracks,
+ * besides the files genereated with the on-demand example.
 */
 
 use Shaka\Options\Streams\DASHStream;

examples/dash/single_file_MP4_output_with_DASH_plus_HLS.php

@@ -1,11 +1,11 @@
 <?php
 
 /**
-=========================================================
-Single file MP4 output with DASH + HLS
-=========================================================
-The example below creates five single file MP4 streams,
-and HLS playlists as well as DASH manifests.
+ * =========================================================
+ * Single file MP4 output with DASH + HLS
+ * =========================================================
+ * The example below creates five single file MP4 streams,
+ * and HLS playlists as well as DASH manifests.
 */
 
 use Shaka\Options\Streams\HLSStream;

examples/dash/static-live.php

@@ -1,12 +1,12 @@
 <?php
 
 /**
-=========================================================
-static-live
-=========================================================
-The example below creates five groups of segments
-(each with an init segment and a series of media segments)
-for the five streams and a manifest, which describes the streams.
+ * =========================================================
+ * static-live
+ * =========================================================
+ * The example below creates five groups of segments
+ * (each with an init segment and a series of media segments)
+ * for the five streams and a manifest, which describes the streams.
 */
 
 use Shaka\Options\Streams\DASHStream;

examples/drm/raw/cbcs_protection_scheme.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
-=========================================================
-‘cbcs’ protection scheme
-=========================================================
-The example below use the H264 streams created in Media Encoding.
+ * =========================================================
+ * ‘cbcs’ protection scheme
+ * =========================================================
+ * The example below use the H264 streams created in Media Encoding.
 */
 
 use Shaka\Options\Streams\Stream;

examples/drm/raw/multi-drm_(Widevine_and_PlayReady).php

@@ -1,11 +1,11 @@
 <?php
 
 /**
-=========================================================
-multi-drm (Widevine and PlayReady)
-=========================================================
-The example below use the H264 streams created in Media Encoding.
- */
+ * =========================================================
+ * multi-drm (Widevine and PlayReady)
+ * =========================================================
+ * The example below use the H264 streams created in Media Encoding.
+*/
 
 use Shaka\Options\Streams\Stream;
 

examples/drm/raw/no_PSSH_or_protection_system.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
-=========================================================
-Common PSSH is generated if no PSSH or protection system flag is specified
-=========================================================
-The example below use the H264 streams created in Media Encoding.
+ * =========================================================
+ * Common PSSH is generated if no PSSH or protection system flag is specified
+ * =========================================================
+ * The example below use the H264 streams created in Media Encoding.
 */
 
 use Shaka\Options\Streams\DRMStream;

examples/drm/raw/pre-generated_PSSH.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
-=========================================================
-pre-generated PSSH
-=========================================================
-The example below use the H264 streams created in Media Encoding.
+ * =========================================================
+ * pre-generated PSSH
+ * =========================================================
+ * The example below use the H264 streams created in Media Encoding.
 */
 
 use Shaka\Options\Streams\DRMStream;

examples/drm/widevine/DASH_and_HLS_output.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
-=========================================================
-DASH and HLS output
-=========================================================
-The example below use the H264 streams created in Media Encoding.
+ * =========================================================
+ * DASH and HLS output
+ * =========================================================
+ * The example below use the H264 streams created in Media Encoding.
  */
 
 use Shaka\Options\Streams\Stream;

examples/drm/widevine/cbcs_protection_scheme.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
-=========================================================
-‘cbcs’ protection scheme
-=========================================================
-The example below use the H264 streams created in Media Encoding.
+ * =========================================================
+ * ‘cbcs’ protection scheme
+ * =========================================================
+ * The example below use the H264 streams created in Media Encoding.
 */
 
 use Shaka\Options\Streams\Stream;

examples/drm/widevine/multi-drm_(Widevine_and_PlayReady).php

@@ -1,10 +1,10 @@
 <?php
 
 /**
-=========================================================
-multi-drm (Widevine and PlayReady)
-=========================================================
-The example below use the H264 streams created in Media Encoding.
+ * =========================================================
+ * multi-drm (Widevine and PlayReady)
+ * =========================================================
+ * The example below use the H264 streams created in Media Encoding.
  */
 
 use Shaka\Options\Streams\Stream;