Fix "E_DEPRECATED: Using null as an array offset is deprecated, use an empty string instead"

See #351 (comment)

Author: thekid

src/main/php/lang/DynamicClassLoader.class.php

@@ -45,7 +45,7 @@ public function setClassBytes($fqcn, $bytes, $prefix= '<?php') {
    * @return  bool
    */
   public function providesClass($class) {
-    return isset(self::$bytes[$class]);
+    return null === $class ? false : isset(self::$bytes[$class]);
   }
 
   /**
@@ -99,8 +99,11 @@ protected function classUri($class) {
    * @return  string fully qualified class name, or NULL
    */
   protected function classAtUri($uri) {
-    sscanf($uri, 'dyn://%s', $name);
-    return isset(self::$bytes[$name]) ? $name : null;
+    if (sscanf($uri, 'dyn://%s', $name)) {
+      return isset(self::$bytes[$name]) ? $name : null;
+    } else {
+      return null;
+    }
   }
 
   /**

src/main/php/util/Properties.class.php

@@ -75,7 +75,7 @@ public function expanding($kind, $expansion) {
   public function load($in, $charset= 'utf-8'): self {
     $reader= $in instanceof Reader ? $in : new TextReader($in, $charset);
     $this->_data= [];
-    $section= null;
+    $section= '';
 
     while (null !== ($t= $reader->readLine())) {
       $trimmedToken= trim($t);
@@ -233,6 +233,7 @@ public function sections(): Traversable {
    */
   public function readSection($name, $default= []) {
     $this->_load();
+    $name??= '';
     if (null === ($section= $this->_data[$name] ?? null)) return $default;
 
     $expansion= $this->expansion ?? self::$env;
@@ -253,7 +254,7 @@ public function readSection($name, $default= []) {
    */ 
   public function readString($section, $key, $default= '') {
     $this->_load();
-    if (null === ($value= $this->_data[$section][$key] ?? null)) return $default;
+    if (null === ($value= $this->_data[$section ?? ''][$key] ?? null)) return $default;
 
     $expansion= $this->expansion ?? self::$env;
     return $expansion->in($value);
@@ -269,7 +270,7 @@ public function readString($section, $key, $default= '') {
    */
   public function readArray($section, $key, $default= []) {
     $this->_load();
-    if (null === ($value= $this->_data[$section][$key] ?? null)) return $default;
+    if (null === ($value= $this->_data[$section ?? ''][$key] ?? null)) return $default;
 
     // New: key[]="a" or key[0]="a"
     // Old: key="" (an empty array) or key="a|b|c"
@@ -293,7 +294,7 @@ public function readArray($section, $key, $default= []) {
    */
   public function readMap($section, $key, $default= null) {
     $this->_load();
-    if (null === ($value= $this->_data[$section][$key] ?? null)) return $default;
+    if (null === ($value= $this->_data[$section ?? ''][$key] ?? null)) return $default;
 
     // New: key[color]="green" and key[make]="model"
     // Old: key="color:green|make:model"
@@ -326,7 +327,7 @@ public function readMap($section, $key, $default= null) {
    */
   public function readRange($section, $key, $default= []) {
     $this->_load();
-    if (null === ($value= $this->_data[$section][$key] ?? null)) return $default;
+    if (null === ($value= $this->_data[$section ?? ''][$key] ?? null)) return $default;
 
     $expansion= $this->expansion ?? self::$env;
     if (2 === sscanf($expansion->in($value), '%d..%d', $min, $max)) {
@@ -346,7 +347,7 @@ public function readRange($section, $key, $default= []) {
    */ 
   public function readInteger($section, $key, $default= 0) {
     $this->_load();
-    if (null === ($value= $this->_data[$section][$key] ?? null)) return $default;
+    if (null === ($value= $this->_data[$section ?? ''][$key] ?? null)) return $default;
 
     $expansion= $this->expansion ?? self::$env;
     return (int)$expansion->in($value);
@@ -362,7 +363,7 @@ public function readInteger($section, $key, $default= 0) {
    */ 
   public function readFloat($section, $key, $default= 0.0) {
     $this->_load();
-    if (null === ($value= $this->_data[$section][$key] ?? null)) return $default;
+    if (null === ($value= $this->_data[$section ?? ''][$key] ?? null)) return $default;
 
     $expansion= $this->expansion ?? self::$env;
     return (float)$expansion->in($value);
@@ -380,7 +381,7 @@ public function readBool($section, $key, $default= false) {
     static $true= ['1' => 1, 'yes' => 1, 'true' => 1, 'on' => 1];
 
     $this->_load();
-    if (null === ($value= $this->_data[$section][$key] ?? null)) return $default;
+    if (null === ($value= $this->_data[$section ?? ''][$key] ?? null)) return $default;
 
     $expansion= $this->expansion ?? self::$env;
     return isset($true[strtolower($expansion->in($value))]);
@@ -419,6 +420,7 @@ public function writeSection($name, $overwrite= false) {
    */
   public function writeString($section, $key, $value) {
     $this->_load();
+    $section??= '';
     if (!$this->hasSection($section)) $this->_data[$section]= [];
     $this->_data[$section][$key]= (string)$value;
   }
@@ -432,6 +434,7 @@ public function writeString($section, $key, $value) {
    */
   public function writeInteger($section, $key, $value) {
     $this->_load();
+    $section??= '';
     if (!$this->hasSection($section)) $this->_data[$section]= [];
     $this->_data[$section][$key]= (int)$value;
   }
@@ -445,6 +448,7 @@ public function writeInteger($section, $key, $value) {
    */
   public function writeFloat($section, $key, $value) {
     $this->_load();
+    $section??= '';
     if (!$this->hasSection($section)) $this->_data[$section]= [];
     $this->_data[$section][$key]= (float)$value;
   }
@@ -458,6 +462,7 @@ public function writeFloat($section, $key, $value) {
    */
   public function writeBool($section, $key, $value) {
     $this->_load();
+    $section??= '';
     if (!$this->hasSection($section)) $this->_data[$section]= [];
     $this->_data[$section][$key]= $value ? 'yes' : 'no';
   }
@@ -471,6 +476,7 @@ public function writeBool($section, $key, $value) {
    */
   public function writeArray($section, $key, $value) {
     $this->_load();
+    $section??= '';
     if (!$this->hasSection($section)) $this->_data[$section]= [];
     $this->_data[$section][$key]= $value;
   }
@@ -484,6 +490,7 @@ public function writeArray($section, $key, $value) {
    */
   public function writeMap($section, $key, $value) {
     $this->_load();
+    $section??= '';
     if (!$this->hasSection($section)) $this->_data[$section]= [];
     $this->_data[$section][$key]= $value;
   }
@@ -497,6 +504,7 @@ public function writeMap($section, $key, $value) {
    */
   public function writeComment($section, $comment) {
     $this->_load();
+    $section??= '';
     if (!$this->hasSection($section)) $this->_data[$section]= [];
     $this->_data[$section][';'.sizeof($this->_data[$section])]= $comment;
   }
@@ -509,6 +517,7 @@ public function writeComment($section, $comment) {
    */
   public function removeSection($section) {
     $this->_load();
+    $section??= '';
     if (!isset($this->_data[$section])) throw new IllegalStateException('Cannot remove nonexistant section "'.$section.'"');
     unset($this->_data[$section]);
   }
@@ -522,6 +531,7 @@ public function removeSection($section) {
    */
   public function removeKey($section, $key) {
     $this->_load();
+    $section??= '';
     if (!isset($this->_data[$section][$key])) throw new IllegalStateException('Cannot remove nonexistant key "'.$key.'" in "'.$section.'"');
     unset($this->_data[$section][$key]);
   }

src/test/php/lang/unittest/TypeDefinition.class.php

@@ -12,7 +12,7 @@ trait TypeDefinition {
    * @param  [:var] $definition
    * @return lang.XPClass
    */
-  protected function type($decl= null, array $definition= []) {
+  protected function type($decl= '', array $definition= []) {
     if (!isset(self::$fixtures[$decl])) {
       $defaults= [
         'modifiers'  => '',