bellord/bx.nullable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
bellord
2024-07-07 12:39:20 +03:00
parent 67484d79f9
commit d8b103fe33
29 changed files with 156 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/abstractfactory/mainabstractfactory.php
+5 -5
View File
@@ -1,20 +1,20 @@
<?php
namespace Bx\Null\AbstractFactory;
namespace Bx\Nullable\AbstractFactory;
use Wt\Core\AbstractFactory\AAbstractFactory;
use Bx\Null\Factory\NullFactory;
use Bx\Nullable\Factory\NullableFactory;
class MainAbstractFactory extends AAbstractFactory
{
/**
* @return NullFactory
* @return NullableFactory
*/
public function getNullFactory()
public function getNullableFactory()
{
return $this->getFactoryInstance(NullFactory::class);
return $this->getFactoryInstance(NullableFactory::class);
}
}
lib/ajax/bxnull.php → lib/ajax/bxnullable.php
+3 -3
View File
@@ -1,12 +1,12 @@
<?php
namespace Bx\Null\Ajax;
namespace Bx\Nullable\Ajax;
use Wt\Core\Ajax\AAjaxHandler;
class BxNull extends AAjaxHandler
class BxNullable extends AAjaxHandler
{
public function ajaxStart()
{
@@ -15,7 +15,7 @@ class BxNull extends AAjaxHandler
public function test()
{
$this->getResponse()->addData(['method' => 'test', 'version' => nullApp()->module()->getVersion()]);
$this->getResponse()->addData(['method' => 'test', 'version' => app()::getInstance('bx.nullable')->module()->getVersion()]);
return $this->getResponse();
}
}
lib/app/app.php
+7 -7
View File
@@ -1,15 +1,15 @@
<?php
namespace Bx\Null\App;
namespace Bx\Nullable\App;
use Bx\Null\Facade\DefaultDefines;
use Bx\Null\Facade\Defines;
use Bx\Null\Facade\DefaultServiceFacade;
use Bx\Null\Facade\ServiceFacade;
use Bx\Null\Facade\DefaultFactoryFacade;
use Bx\Null\Facade\FactoryFacade;
use Bx\Nullable\Facade\DefaultDefines;
use Bx\Nullable\Facade\Defines;
use Bx\Nullable\Facade\DefaultServiceFacade;
use Bx\Nullable\Facade\ServiceFacade;
use Bx\Nullable\Facade\DefaultFactoryFacade;
use Bx\Nullable\Facade\FactoryFacade;
class App extends \Wt\Core\App\App
{
lib/collection/nullcollection.php → lib/collection/nullablecollection.php
+12 -12
View File
@@ -1,18 +1,18 @@
<?php
namespace Bx\Null\Collection;
namespace Bx\Nullable\Collection;
use Wt\Core\Collection\AEntityCollection;
use Bx\Null\Entity\NullEntity;
use Bx\Nullable\Entity\NullableEntity;
class NullCollection extends AEntityCollection
class NullableCollection extends AEntityCollection
{
/**
* @param $xmlId
* @return NullEntity
* @return NullableEntity
*/
public function &getByXmlId($xmlId)
{
@@ -22,7 +22,7 @@ class NullCollection extends AEntityCollection
/**
* @param $id
* @param null $default
* @return NullEntity|null
* @return NullableEntity|null
*/
public function &get($id, $default = null)
{
@@ -30,15 +30,15 @@ class NullCollection extends AEntityCollection
}
/**
* @return NullEntity
* @return NullableEntity
*/
public function &first()
public function &first(callable $callback = null, $default = null)
{
return parent::first(); // TODO: Change the autogenerated stub
return parent::first($callback, $default); // TODO: Change the autogenerated stub
}
/**
* @return NullEntity
* @return NullableEntity
*/
public function &last()
{
@@ -46,7 +46,7 @@ class NullCollection extends AEntityCollection
}
/**
* @return NullEntity
* @return NullableEntity
*/
public function shift()
{
@@ -54,7 +54,7 @@ class NullCollection extends AEntityCollection
}
/**
* @return NullEntity
* @return NullableEntity
*/
public function pop()
{
@@ -62,7 +62,7 @@ class NullCollection extends AEntityCollection
}
/**
* @return NullEntity[]
* @return NullableEntity[]
*/
public function all()
{
lib/entity/nullableentity.php
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace Bx\Nullable\Entity;
use Bx\Nullable\IFields\NullableFields;
use Wt\Core\Entity\AEntity;
class NullableEntity extends AEntity
{
/**
* @return NullableFields
*/
public function fields()
{
return parent::fields();
}
}
lib/entity/nullentity.php
-20
View File
@@ -1,20 +0,0 @@
<?php
namespace Bx\Null\Entity;
use Bx\Null\IFields\NullFields;
use Wt\Core\Entity\AEntity;
use Wt\Core\Supports\Entity;
class NullEntity extends AEntity
{
/**
* @return NullFields
*/
public function fields()
{
return parent::fields();
}
}
lib/facade/defaultdefines.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
namespace Bx\Null\Facade;
namespace Bx\Nullable\Facade;
use Wt\Core\App\ADefines;
lib/facade/defaultfactoryfacade.php
+2 -2
View File
@@ -1,10 +1,10 @@
<?php
namespace Bx\Null\Facade;
namespace Bx\Nullable\Facade;
use Bx\Null\AbstractFactory\MainAbstractFactory;
use Bx\Nullable\AbstractFactory\MainAbstractFactory;
use Wt\Core\Facade\AFacade;
class DefaultFactoryFacade extends AFacade
lib/facade/defaultservicefacade.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
namespace Bx\Null\Facade;
namespace Bx\Nullable\Facade;
use Wt\Core\Facade\AFacade;
lib/factory/nullormfactory.php → lib/factory/nullablefactory.php
+14 -14
View File
@@ -1,44 +1,44 @@
<?php
namespace Bx\Null\Factory;
namespace Bx\Nullable\Factory;
use Bx\Null\Collection\NullCollection;
use Bx\Null\Entity\NullEntity;
use Bx\Null\ORM\NullTable;
use Bx\Nullable\Collection\NullableCollection;
use Bx\Nullable\Entity\NullableEntity;
use Bx\Nullable\ORM\NullableTable;
use Wt\Core\Factory\AFactory;
use Wt\Core\Factory\AORMFactory;
class NullFactory extends AORMFactory
class NullableFactory extends AORMFactory
{
/**
* @return string|NullTable
* @return string|NullableTable
*/
protected function __getDataManagerClass()
{
return NullTable::class;
return NullableTable::class;
}
public function __getEntityClass()
{
return NullEntity::class;
return NullableEntity::class;
}
public function __getCachePrefix()
{
return 'bx_null';
return 'bx_nullable';
}
public function __getCollectionClass()
{
return NullCollection::class;
return NullableCollection::class;
}
/**
* @param $id
* @return NullEntity
* @return NullableEntity
*/
public function getEntityById($id)
{
@@ -51,7 +51,7 @@ class NullFactory extends AORMFactory
* @param array $select
* @param null $limit
* @param null $offset
* @return NullCollection|NullEntity[]
* @return NullableCollection|NullableEntity[]
*/
public function getCollection($filter = [], $order = [], $select = [], $limit = null, $offset = null)
{
@@ -60,7 +60,7 @@ class NullFactory extends AORMFactory
/**
* @param array $arIds
* @return NullCollection|NullEntity[]
* @return NullableCollection|NullableEntity[]
*/
public function getEntityByIds(array $arIds)
{
@@ -68,7 +68,7 @@ class NullFactory extends AORMFactory
}
/**
* @return NullTable
* @return NullableTable
*/
public function getDataManager()
{
lib/ifields/nullablefields.php
+12
View File
@@ -0,0 +1,12 @@
<?php
namespace Bx\Nullable\IFields;
use Wt\Core\Interfaces\IFields;
class NullableFields implements IFields
{
}
lib/ifields/nullfields.php
-12
View File
@@ -1,12 +0,0 @@
<?php
namespace Bx\Null\IFields;
use Wt\Core\Interfaces\IFields;
class NullFields implements IFields
{
}
lib/orm/nulltable.php → lib/orm/nullabletable.php
+6 -6
View File
@@ -1,34 +1,34 @@
<?php
namespace Bx\Null\ORM;
namespace Bx\Nullable\ORM;
use Bitrix\Main\ORM\Fields\DatetimeField;
use Bitrix\Main\Type\DateTime;
use Wt\Core\ORM\ADataManager;
class NullTable extends ADataManager
class NullableTable extends ADataManager
{
public static function getTitle()
{
return 'Null Title';
return 'Nullable Title';
}
public static function getRowTitle()
{
return 'Null Row Title';
return 'Nullable Row Title';
}
public static function getRowDescription()
{
return 'Null Row Description';
return 'Nullable Row Description';
}
public static function getTableName()
{
return 'bx_null_table';
return 'bx_nullable_table';
}
public static function getMap()
lib/providers/defaultfactoryprovider.php
+3 -3
View File
@@ -1,10 +1,10 @@
<?php
namespace Bx\Null\Providers;
namespace Bx\Nullable\Providers;
use Bx\Null\AbstractFactory\MainAbstractFactory;
use Bx\Nullable\AbstractFactory\MainAbstractFactory;
use Wt\Core\Interfaces\IApp;
use Wt\Core\Interfaces\IServiceProvider;
@@ -16,7 +16,7 @@ class DefaultFactoryProvider implements IServiceProvider
$serviceContainer = $app->container();
/**
* @var $mainAbstractFactory MainAbstractFactory
* @var MainAbstractFactory $mainAbstractFactory
*/
$mainAbstractFactory = $serviceContainer->make(MainAbstractFactory::class, [$config->get('MainAbstractFactory', [])]);
$serviceContainer->singleton($app->module()->getId().':mainAbstractFactory', $mainAbstractFactory);
lib/providers/defaultserviceprovider.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
namespace Bx\Null\Providers;
namespace Bx\Nullable\Providers;
use Wt\Core\Interfaces\IApp;