fix php warnings

.gitignore

@@ -1,4 +1,4 @@
 /vendor
-/cache
+/.phpunit.cache
 /build
-
+composer.lock

composer.json

@@ -16,7 +16,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "*"
+        "phpunit/phpunit": "<12"
     },
     "config": {
     }

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <coverage>
     <report>
       <clover outputFile="build/logs/clover.xml"/>

src/PhpTabs/Music/Scale.php

@@ -40,7 +40,7 @@ public function setNote(int $note, bool $on): void
         $this->notes[$note] = $on;
     }
 
-    public function getNote(int $note): int
+    public function getNote(int $note): bool
     {
         return $this->notes[($note + 12 - $this->key) % 12];
     }

src/PhpTabs/Music/Song.php

@@ -20,7 +20,7 @@ final class Song extends SongBase
     /**
      * Get the list of instruments
      *
-     * @return array<key,array<int,string>>
+     * @return array<int, array{id: int, name: string}>
      */
     public function getInstruments(): array
     {
@@ -52,7 +52,7 @@ public function countInstruments(): int
     /**
      * Gets an instrument by channelId
      *
-     * @return array<int,array<int,string>>
+     * @return array{id: int, name: string}|null
      */
     public function getInstrument(int $index): ?array
     {

src/PhpTabs/PhpTabs.php

@@ -85,9 +85,10 @@ public function setTablature(Tablature $tablature): self
     public function fromArray(array $data): self
     {
         $importer = new Importer($data);
+        $tabulature = new Tablature();
+        $tabulature->setSong($importer->getSong());
 
-        $this->setTablature(new Tablature())
-             ->setSong($importer->getSong());
+        $this->setTablature($tabulature);
 
         return $this;
     }

src/PhpTabs/Reader/GuitarPro/GuitarPro3Reader.php

@@ -37,11 +37,6 @@ final class GuitarPro3Reader extends GuitarProReaderBase
      */
     protected $tripletFeel;
 
-    /**
-     * @var int
-     */
-    protected $keySignature;
-
     /**
      * @param \PhpTabs\Component\InputStream $file An input file to read
      */
@@ -135,7 +130,7 @@ private function readMeasureHeaders(Song $song, int $count): void
     /**
      * Loops on tracks to read
      *
-     * @param array<PhpTabs\Music\Channel> $channels
+     * @param array<\PhpTabs\Music\Channel> $channels
      */
     private function readTracks(Song $song, int $count, array $channels): void
     {

src/PhpTabs/Reader/GuitarPro/GuitarPro4Reader.php

@@ -41,11 +41,6 @@ final class GuitarPro4Reader extends GuitarProReaderBase
      */
     protected $tripletFeel;
 
-    /**
-     * @var int
-     */
-    protected $keySignature;
-
     /**
      * @var \PhpTabs\Component\Tablature
      */
@@ -185,7 +180,7 @@ private function readMeasureHeaders(Song $song, int $count): void
     /**
      * Loop on tracks to read
      *
-     * @param array<PhpTabs\Music\Channel> $channels
+     * @param array<\PhpTabs\Music\Channel> $channels
      */
     private function readTracks(Song $song, int $count, array $channels, Lyric $lyric, int $lyricTrack): void
     {

src/PhpTabs/Reader/GuitarPro/GuitarPro5Reader.php

@@ -31,11 +31,6 @@ final class GuitarPro5Reader extends GuitarProReaderBase
         'FICHIER GUITAR PRO v5.10',
     ];
 
-    /**
-     * @var int
-     */
-    protected $keySignature;
-
     /**
      * @var \PhpTabs\Component\Tablature
      */

src/PhpTabs/Reader/GuitarPro/GuitarProReaderBase.php

@@ -40,6 +40,11 @@ abstract class GuitarProReaderBase implements GuitarProReaderInterface
      */
     private $file;
 
+    /**
+     * @var int
+     */
+    protected $keySignature;
+
     /**
      * @param \PhpTabs\Component\InputStream $file An input file to read
      */

src/PhpTabs/Reader/GuitarPro/Helper/GuitarPro3Track.php

@@ -22,7 +22,7 @@ final class GuitarPro3Track extends AbstractReader
     /**
      * Reads track informations
      *
-     * @param array<PhpTabs\Music\Channel> $channels
+     * @param array<\PhpTabs\Music\Channel> $channels
      */
     public function readTrack(Song $song, array $channels = []): Track
     {

src/PhpTabs/Reader/GuitarPro/Helper/GuitarPro4Track.php

@@ -23,7 +23,7 @@ final class GuitarPro4Track extends AbstractReader
     /**
      * Reads track informations
      *
-     * @param array<PhpTabs\Music\Channel> $channels
+     * @param array<\PhpTabs\Music\Channel> $channels
      */
     public function readTrack(Song $song, array $channels, Lyric $lyrics): Track
     {

src/PhpTabs/Reader/GuitarPro/Helper/GuitarPro5Track.php

@@ -23,7 +23,7 @@ final class GuitarPro5Track extends AbstractReader
     /**
      * Read track informations
      *
-     * @param array<PhpTabs\Music\Channel> $channels
+     * @param array<\PhpTabs\Music\Channel> $channels
      */
     public function readTrack(Song $song, array $channels, Lyric $lyrics): Track
     {

src/PhpTabs/Reader/Midi/MidiAdjuster.php

@@ -215,7 +215,7 @@ private function adjustStrings(Beat $beat): void
     }
 
     /**
-     * @param array<TabString> $strings
+     * @param array<\PhpTabs\Music\TabString> $strings
      */
     private function getStringForValue(array $strings, int $value): int
     {

src/PhpTabs/Reader/Midi/MidiReader.php

@@ -81,6 +81,21 @@ final class MidiReader extends MidiReaderBase
      */
     private $settings;
 
+    /**
+     * @var Tablature|null
+     */
+    private $tablature;
+
+    /**
+     * @var MidiSequence
+     */
+    private $sequence;
+
+    /**
+     * @var ChannelRouter
+     */
+    private $channelRouter;
+
     /**
      * @param \PhpTabs\Component\InputStream $file An input file to read
      */
@@ -92,7 +107,7 @@ public function __construct(InputStream $file)
 
         $this->setTablature($song);
 
-        $this->settings = (new MidiSettings())->getDefaults();
+        $this->settings = MidiSettings::getDefaults();
         $this->sequence = $this->getSequence();
         $this->initFields($this->sequence);
 

src/PhpTabs/Renderer/Ascii/AsciiBase.php

@@ -47,11 +47,11 @@ public function drawBarSegment(): void
     public function drawNote(string $fret): void
     {
         $this->movePoint(
-            $this->getPosX() + mb_strlen(strval($fret)),
+            $this->getPosX() + mb_strlen($fret),
             $this->getPosY()
         );
 
-        $this->append(strval($fret));
+        $this->append($fret);
     }
 
     /**
@@ -205,7 +205,7 @@ public function output(): string
 
         for ($line = 0; $line <= $maxLines; $line++) {
             for ($col = 0; $col <= $maxCols; $col++) {
-                if (isset($this->content[$line], $this->content[$line][$col])) {
+                if (isset($this->content[$line][$col])) {
                     $content .= $this->content[$line][$col];
                 }
             }

src/PhpTabs/Writer/Midi/MidiSequenceParser.php

@@ -212,7 +212,6 @@ private function makeBeats(MidiSequenceHelper $helper, Channel $channel, Track $
             $stroke[] = 0;
         }
 
-        $track->getStrings();
         $previous = null;
 
         $countBeats = $measure->countBeats();

src/PhpTabs/Writer/Midi/MidiWriter.php

@@ -55,7 +55,7 @@ public function __construct(Song $song)
         $channelRouter = new ChannelRouter();
         $channelRouterConfigurator = new ChannelRouterConfigurator($channelRouter);
         $channelRouterConfigurator->configureRouter($song->getChannels());
-        $settings = (new MidiSettings())->getDefaults();
+        $settings = MidiSettings::getDefaults();
 
         $midiSequenceParser = new MidiSequenceParser(
             $song,