diff --git a/.idea/nur-sery.iml b/.idea/nur-sery.iml
index 5d55ddf..d492cf6 100644
--- a/.idea/nur-sery.iml
+++ b/.idea/nur-sery.iml
@@ -4,6 +4,7 @@
+
diff --git a/src/F.php b/src/params/F.php
similarity index 97%
rename from src/F.php
rename to src/params/F.php
index 73bca77..68dae56 100644
--- a/src/F.php
+++ b/src/params/F.php
@@ -1,12 +1,12 @@
offsetExists($key)) return $array->offsetGet($key);
else return $default;
} else {
- if (!is_array($array)) $array = A::with($array);
- return A::get($array, $key, $default);
+ if (!is_array($array)) $array = cl::with($array);
+ return cl::get($array, $key, $default);
}
}
@@ -25,7 +26,7 @@ class akey {
if ($array instanceof ArrayAccess) {
$array->offsetSet($key, $value);
} else {
- A::set($array, $key, $value);
+ cl::set($array, $key, $value);
}
return $value;
}
@@ -45,8 +46,8 @@ class akey {
$array->offsetSet($key, ++$value);
return $value;
} else {
- A::ensure_array($array);
- $value = (int)A::get($array, $key);
+ cl::ensure_array($array);
+ $value = (int)cl::get($array, $key);
return $array[$key] = ++$value;
}
}
@@ -58,8 +59,8 @@ class akey {
if ($allow_negative || $value > 0) $array->offsetSet($key, --$value);
return $value;
} else {
- A::ensure_array($array);
- $value = (int)A::get($array, $key);
+ cl::ensure_array($array);
+ $value = (int)cl::get($array, $key);
if ($allow_negative || $value > 0) $array[$key] = --$value;
return $value;
}
@@ -72,11 +73,11 @@ class akey {
static final function merge(&$array, $key, $merge): void {
if ($array instanceof ArrayAccess) {
$value = $array->offsetGet($key);
- A::merge($value, $merge);
+ cl::merge($value, $merge);
$array->offsetSet($key, $value);
} else {
- A::ensure_array($array);
- A::merge($array[$key], $merge);
+ cl::ensure_array($array);
+ cl::merge($array[$key], $merge);
}
}
@@ -87,11 +88,11 @@ class akey {
static final function append(&$array, $key, $value): void {
if ($array instanceof ArrayAccess) {
$value = $array->offsetGet($key);
- A::set($value, null, $value);
+ cl::set($value, null, $value);
$array->offsetSet($key, $value);
} else {
- A::ensure_array($array);
- A::set($array[$key], null, $value);
+ cl::ensure_array($array);
+ cl::set($array[$key], null, $value);
}
}
}
diff --git a/src/values/prop.php b/src/values/mprop.php
similarity index 89%
rename from src/values/prop.php
rename to src/values/mprop.php
index e60659d..3791010 100644
--- a/src/values/prop.php
+++ b/src/values/mprop.php
@@ -1,17 +1,19 @@
getProperty($property);
$p->setAccessible(true);
- $values = A::with($p->getValue($object));
- A::merge($values, A::with($array));
+ $values = cl::with($p->getValue($object));
+ cl::merge($values, cl::with($array));
$p->setValue($object, $values);
} catch (ReflectionException $e) {
if (property_exists($object, $property)) {
- $values = A::with($object->$property);
+ $values = cl::with($object->$property);
} else {
$values = [];
}
- A::merge($values, A::with($array));
+ cl::merge($values, cl::with($array));
$object->$property = $values;
}
}
@@ -134,12 +135,12 @@ class oprop {
try {
$p = $c->getProperty($property);
$p->setAccessible(true);
- $values = A::with($p->getValue($object));
+ $values = cl::with($p->getValue($object));
$values[] = $value;
$p->setValue($object, $values);
} catch (ReflectionException $e) {
if (property_exists($object, $property)) {
- $values = A::with($object->$property);
+ $values = cl::with($object->$property);
} else {
$values = [];
}
diff --git a/src/values/valm.php b/src/values/valm.php
index 1c0f45d..c141e9d 100644
--- a/src/values/valm.php
+++ b/src/values/valm.php
@@ -1,12 +1,13 @@