@@ -18,7 +18,7 @@ |
||
| 18 | 18 | public function cacheProcess($callback) |
| 19 | 19 | {
|
| 20 | 20 | //we do cache key control for method cache container data. |
| 21 | - if(isset($this->app['cache']['methodCache']['cache'])){
|
|
| 21 | + if (isset($this->app['cache']['methodCache']['cache'])) {
|
|
| 22 | 22 | |
| 23 | 23 | //get cache data |
| 24 | 24 | $cache = $this->app['cache']['methodCache']['cache']; |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | * @param null|string $alias |
| 12 | 12 | * @return mixed |
| 13 | 13 | */ |
| 14 | - public function bind($object=null,$callback=null,$alias=null); |
|
| 14 | + public function bind($object = null, $callback = null, $alias = null); |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * @param $abstract |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * @param $container false |
| 39 | 39 | * @return mixed |
| 40 | 40 | */ |
| 41 | - public function make($object=null,$callback=null,$container=false); |
|
| 41 | + public function make($object = null, $callback = null, $container = false); |
|
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * @param $key |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | * @param null $concrete |
| 47 | 47 | * @return mixed |
| 48 | 48 | */ |
| 49 | - public function register($key,$object,$concrete=null); |
|
| 49 | + public function register($key, $object, $concrete = null); |
|
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * @param null $object |
| 53 | 53 | * @param null $callback |
| 54 | 54 | * @return mixed |
| 55 | 55 | */ |
| 56 | - public function share($object=null,$callback=null); |
|
| 56 | + public function share($object = null, $callback = null); |
|
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * @method singleton |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @param array $bind |
| 67 | 67 | * @return mixed |
| 68 | 68 | */ |
| 69 | - public function resolve($class,$bind=array()); |
|
| 69 | + public function resolve($class, $bind = array()); |
|
| 70 | 70 | |
| 71 | 71 | /** |
| 72 | 72 | * @param $class |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | /** |
| 16 | 16 | * @var $type |
| 17 | 17 | */ |
| 18 | - public $type='model'; |
|
| 18 | + public $type = 'model'; |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @var array |
@@ -32,17 +32,17 @@ discard block |
||
| 32 | 32 | /** |
| 33 | 33 | * @var $commandRule |
| 34 | 34 | */ |
| 35 | - public $commandRule=['model','?table']; |
|
| 35 | + public $commandRule = ['model', '?table']; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @method create |
| 39 | 39 | * @return mixed |
| 40 | 40 | */ |
| 41 | - public function create(){
|
|
| 41 | + public function create() {
|
|
| 42 | 42 | |
| 43 | 43 | $this->argument['file'] = $this->argument['model']; |
| 44 | 44 | |
| 45 | - if(!isset($this->argument['table'])){
|
|
| 45 | + if (!isset($this->argument['table'])) {
|
|
| 46 | 46 | $this->argument['table'] = $this->argument['file'].'s'; |
| 47 | 47 | } |
| 48 | 48 | |
@@ -66,11 +66,11 @@ discard block |
||
| 66 | 66 | $this->touch['model/builder'] = $this->directory['builderDir'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Builder.php'; |
| 67 | 67 | $this->touch['model/contract'] = $this->directory['contract'].''.DIRECTORY_SEPARATOR.''.$this->argument['file'].'Contract.php'; |
| 68 | 68 | |
| 69 | - if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')){
|
|
| 69 | + if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php')) {
|
|
| 70 | 70 | $this->touch['model/scope'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Scope.php'; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - if(!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')){
|
|
| 73 | + if (!file_exists($this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php')) {
|
|
| 74 | 74 | $this->touch['model/event'] = $this->directory['helper'].''.DIRECTORY_SEPARATOR.'Event.php'; |
| 75 | 75 | } |
| 76 | 76 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | $entityDir = $this->directory['modelDir'].''.DIRECTORY_SEPARATOR.'Entity'; |
| 80 | 80 | |
| 81 | - if(!file_exists($entityDir)){
|
|
| 81 | + if (!file_exists($entityDir)) {
|
|
| 82 | 82 | files()->makeDirectory($entityDir); |
| 83 | 83 | } |
| 84 | 84 | |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | $entityClass = $entityDir.''.DIRECTORY_SEPARATOR.''.$entityTableName.''.DIRECTORY_SEPARATOR.''.$entityTableName; |
| 88 | 88 | |
| 89 | 89 | |
| 90 | - $generator = new Generator($entityDir,'EntityMap'); |
|
| 90 | + $generator = new Generator($entityDir, 'EntityMap'); |
|
| 91 | 91 | |
| 92 | - if(!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')){
|
|
| 92 | + if (!file_exists($entityDir.''.DIRECTORY_SEPARATOR.'EntityMap.php')) {
|
|
| 93 | 93 | |
| 94 | 94 | //$this->setAnnotations(); |
| 95 | 95 | $generator->createClass(); |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | $entityMapNamespaceResolve = new $entityMapNamespace; |
| 101 | 101 | |
| 102 | - if(!method_exists($entityMapNamespaceResolve,strtolower($this->argument['table']))){
|
|
| 102 | + if (!method_exists($entityMapNamespaceResolve, strtolower($this->argument['table']))) {
|
|
| 103 | 103 | |
| 104 | 104 | $generator->createClassUse([ |
| 105 | 105 | Utils::getNamespace($entityClass) |
@@ -129,15 +129,15 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | |
| 131 | 131 | //set builder map |
| 132 | - $generator = new Generator($this->directory['builderDir'],'BuilderMap'); |
|
| 132 | + $generator = new Generator($this->directory['builderDir'], 'BuilderMap'); |
|
| 133 | 133 | |
| 134 | - if(!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')){
|
|
| 134 | + if (!file_exists($this->directory['builderDir'].''.DIRECTORY_SEPARATOR.'BuilderMap.php')) {
|
|
| 135 | 135 | |
| 136 | 136 | $this->setAnnotations(); |
| 137 | 137 | $generator->createClass(); |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - if(!file_exists($this->touch['model/model'])){
|
|
| 140 | + if (!file_exists($this->touch['model/model'])) {
|
|
| 141 | 141 | |
| 142 | 142 | $generator->createMethod([ |
| 143 | 143 | strtolower($this->argument['file']) |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | //set project touch |
| 161 | - $this->file->touch($this,[ |
|
| 161 | + $this->file->touch($this, [ |
|
| 162 | 162 | 'stub'=>'Model_Create' |
| 163 | 163 | ]); |
| 164 | 164 | |
@@ -169,11 +169,11 @@ discard block |
||
| 169 | 169 | /** |
| 170 | 170 | * @return bool |
| 171 | 171 | */ |
| 172 | - private function setAnnotations(){
|
|
| 172 | + private function setAnnotations() {
|
|
| 173 | 173 | |
| 174 | 174 | $entityMap = app()->path()->model().''.DIRECTORY_SEPARATOR.'Entity'.DIRECTORY_SEPARATOR.'EntityMap.php'; |
| 175 | 175 | |
| 176 | - if(file_exists($entityMap)){
|
|
| 176 | + if (file_exists($entityMap)) {
|
|
| 177 | 177 | |
| 178 | 178 | Utils::changeClass(path()->serviceAnnotations().'.php', |
| 179 | 179 | [ |
@@ -24,29 +24,29 @@ discard block |
||
| 24 | 24 | * @param $arg |
| 25 | 25 | * @return mixed |
| 26 | 26 | */ |
| 27 | - public static function annotationsLoaders($service,$arg) |
|
| 27 | + public static function annotationsLoaders($service, $arg) |
|
| 28 | 28 | {
|
| 29 | 29 | //factory runner |
| 30 | - if($service=="factory"){
|
|
| 30 | + if ($service=="factory") {
|
|
| 31 | 31 | return self::factory(); |
| 32 | 32 | } |
| 33 | 33 | //if $name starts with $needles for repository |
| 34 | - if(Str::endsWith($service,'Repository')){
|
|
| 34 | + if (Str::endsWith($service, 'Repository')) {
|
|
| 35 | 35 | return self::repository($service); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | //if $name starts with $needles for source |
| 39 | - if(Str::endsWith($service,'Source')){
|
|
| 40 | - return self::source($service,$arg); |
|
| 39 | + if (Str::endsWith($service, 'Source')) {
|
|
| 40 | + return self::source($service, $arg); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | //if $name starts with $needles for model |
| 44 | - if(Str::endsWith($service,'Builder')){
|
|
| 44 | + if (Str::endsWith($service, 'Builder')) {
|
|
| 45 | 45 | return self::Builder(ucfirst($service)); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | - if(method_exists(new self,$service)){
|
|
| 49 | + if (method_exists(new self, $service)) {
|
|
| 50 | 50 | return self::$service($arg); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | private static function builder($service) |
| 89 | 89 | {
|
| 90 | 90 | //we are making a namespace assignment for the builder. |
| 91 | - $builder=app()->namespace()->builder().'\BuilderMap'; |
|
| 91 | + $builder = app()->namespace()->builder().'\BuilderMap'; |
|
| 92 | 92 | |
| 93 | 93 | //we are getting builder instance. |
| 94 | 94 | return app()->resolve($builder); |
@@ -116,16 +116,16 @@ discard block |
||
| 116 | 116 | * @param array $bind |
| 117 | 117 | * @return mixed |
| 118 | 118 | */ |
| 119 | - public function container($instance,$class,$bind=array()) |
|
| 119 | + public function container($instance, $class, $bind = array()) |
|
| 120 | 120 | {
|
| 121 | - if(!property_exists($instance->container(),$class)){
|
|
| 121 | + if (!property_exists($instance->container(), $class)) {
|
|
| 122 | 122 | throw new \InvalidArgumentException('container object false for ('.$class.') object');
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - $container=$instance->container()->{$class};
|
|
| 125 | + $container = $instance->container()->{$class};
|
|
| 126 | 126 | |
| 127 | - if(!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)){
|
|
| 128 | - return $instance->resolve($container,$bind); |
|
| 127 | + if (!is_array($instance->container()->{$class}) AND Utils::isNamespaceExists($container)) {
|
|
| 128 | + return $instance->resolve($container, $bind); |
|
| 129 | 129 | } |
| 130 | 130 | return $instance->container()->{$class};
|
| 131 | 131 | } |
@@ -135,8 +135,8 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | public function createAppInstance($object) |
| 137 | 137 | {
|
| 138 | - if(!defined('appInstance')){
|
|
| 139 | - define('appInstance',(base64_encode(serialize($object))));
|
|
| 138 | + if (!defined('appInstance')) {
|
|
| 139 | + define('appInstance', (base64_encode(serialize($object))));
|
|
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
@@ -144,9 +144,9 @@ discard block |
||
| 144 | 144 | * @param array $arg |
| 145 | 145 | * @return mixed |
| 146 | 146 | */ |
| 147 | - private static function date($arg=array()) |
|
| 147 | + private static function date($arg = array()) |
|
| 148 | 148 | {
|
| 149 | - $locale = (count($arg)=="0") ? config('app.locale','en') : current($arg);
|
|
| 149 | + $locale = (count($arg)=="0") ? config('app.locale', 'en') : current($arg);
|
|
| 150 | 150 | |
| 151 | 151 | return app()->resolve(Date::class)->setLocale($locale); |
| 152 | 152 | } |
@@ -166,8 +166,8 @@ discard block |
||
| 166 | 166 | {
|
| 167 | 167 | //we save an instance for the entire application |
| 168 | 168 | //and add it to the helper file to be accessed from anywhere in the application. |
| 169 | - if(!isset(self::$instance['appInstance'])){
|
|
| 170 | - self::$instance['appInstance']=unserialize(base64_decode(appInstance)); |
|
| 169 | + if (!isset(self::$instance['appInstance'])) {
|
|
| 170 | + self::$instance['appInstance'] = unserialize(base64_decode(appInstance)); |
|
| 171 | 171 | return self::$instance['appInstance']; |
| 172 | 172 | } |
| 173 | 173 | return self::$instance['appInstance']; |
@@ -194,9 +194,9 @@ discard block |
||
| 194 | 194 | */ |
| 195 | 195 | private static function queue() |
| 196 | 196 | {
|
| 197 | - if(!isset(self::$instance['queue'])){
|
|
| 197 | + if (!isset(self::$instance['queue'])) {
|
|
| 198 | 198 | |
| 199 | - self::$instance['queue']=(new Queue()); |
|
| 199 | + self::$instance['queue'] = (new Queue()); |
|
| 200 | 200 | return self::$instance['queue']; |
| 201 | 201 | |
| 202 | 202 | } |
@@ -208,18 +208,18 @@ discard block |
||
| 208 | 208 | * @param bool $namespace |
| 209 | 209 | * @return string |
| 210 | 210 | */ |
| 211 | - public static function repository($service,$namespace=false) |
|
| 211 | + public static function repository($service, $namespace = false) |
|
| 212 | 212 | {
|
| 213 | 213 | //I can get the repository name from the magic method as a salt repository, |
| 214 | 214 | //after which we will edit it as an adapter namespace. |
| 215 | - $repositoryName=ucfirst(preg_replace('@Repository@is','',$service));
|
|
| 215 | + $repositoryName = ucfirst(preg_replace('@Repository@is', '', $service));
|
|
| 216 | 216 | |
| 217 | 217 | //If we then configure the name of the simple repository to be an adapter |
| 218 | 218 | //then we will give the user an example of the adapter class in each repository call. |
| 219 | 219 | $repositoryAdapterName = $repositoryName.'Adapter'; |
| 220 | 220 | $repositoryNamespace = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName; |
| 221 | 221 | |
| 222 | - if($namespace) return $repositoryNamespace; |
|
| 222 | + if ($namespace) return $repositoryNamespace; |
|
| 223 | 223 | |
| 224 | 224 | //and eventually we conclude the adapter class of the repository package as an instance. |
| 225 | 225 | return app()->resolve($repositoryNamespace)->adapter(); |
@@ -230,17 +230,17 @@ discard block |
||
| 230 | 230 | * @param $arg |
| 231 | 231 | * @return mixed |
| 232 | 232 | */ |
| 233 | - private static function source($service,$arg) |
|
| 233 | + private static function source($service, $arg) |
|
| 234 | 234 | {
|
| 235 | 235 | //get Source path |
| 236 | - $service=ucfirst($service); |
|
| 237 | - $getCalledClass=str_replace('\\'.class_basename($arg[0]),'',get_class($arg[0]));
|
|
| 238 | - $getCalledClass=class_basename($getCalledClass); |
|
| 236 | + $service = ucfirst($service); |
|
| 237 | + $getCalledClass = str_replace('\\'.class_basename($arg[0]), '', get_class($arg[0]));
|
|
| 238 | + $getCalledClass = class_basename($getCalledClass); |
|
| 239 | 239 | |
| 240 | - $service=str_replace($getCalledClass,'',$service); |
|
| 240 | + $service = str_replace($getCalledClass, '', $service); |
|
| 241 | 241 | |
| 242 | 242 | //run service for endpoint |
| 243 | - $serviceSource=StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main'; |
|
| 243 | + $serviceSource = StaticPathModel::appSourceEndpoint().'\\'.$getCalledClass.'\\'.$service.'\Main'; |
|
| 244 | 244 | return app()->resolve($serviceSource); |
| 245 | 245 | } |
| 246 | 246 | |
@@ -249,9 +249,9 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | public static function redis() |
| 251 | 251 | {
|
| 252 | - if(!isset(self::$instance['redis'])){
|
|
| 252 | + if (!isset(self::$instance['redis'])) {
|
|
| 253 | 253 | |
| 254 | - self::$instance['redis']=(new Redis())->client(); |
|
| 254 | + self::$instance['redis'] = (new Redis())->client(); |
|
| 255 | 255 | return self::$instance['redis']; |
| 256 | 256 | |
| 257 | 257 | } |
@@ -262,13 +262,13 @@ discard block |
||
| 262 | 262 | * @param null $param |
| 263 | 263 | * @return array|null|string |
| 264 | 264 | */ |
| 265 | - public function route($param=null) |
|
| 265 | + public function route($param = null) |
|
| 266 | 266 | {
|
| 267 | - $kernel=self::getAppInstance()->kernel; |
|
| 267 | + $kernel = self::getAppInstance()->kernel; |
|
| 268 | 268 | |
| 269 | - $saltRouteParameters=$kernel->routeParameters; |
|
| 269 | + $saltRouteParameters = $kernel->routeParameters; |
|
| 270 | 270 | |
| 271 | - if($param===null){
|
|
| 271 | + if ($param===null) {
|
|
| 272 | 272 | return $saltRouteParameters; |
| 273 | 273 | } |
| 274 | 274 | |
@@ -284,20 +284,20 @@ discard block |
||
| 284 | 284 | * @param array $select |
| 285 | 285 | * @return mixed|string |
| 286 | 286 | */ |
| 287 | - public function translator($data,$select=array()) |
|
| 287 | + public function translator($data, $select = array()) |
|
| 288 | 288 | {
|
| 289 | - $lang=(new Lingua(path()->appLanguage())); |
|
| 289 | + $lang = (new Lingua(path()->appLanguage())); |
|
| 290 | 290 | |
| 291 | - if(self::app()->has('locale')){
|
|
| 291 | + if (self::app()->has('locale')) {
|
|
| 292 | 292 | $defaultLocale = self::app()->get('locale');
|
| 293 | 293 | } |
| 294 | - else{
|
|
| 294 | + else {
|
|
| 295 | 295 | $defaultLocale = config('app.locale');
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | |
| 299 | - if(count($select)){
|
|
| 300 | - return $lang->include(['default'])->locale($defaultLocale)->get($data,$select); |
|
| 299 | + if (count($select)) {
|
|
| 300 | + return $lang->include(['default'])->locale($defaultLocale)->get($data, $select); |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | return $lang->include(['default'])->locale($defaultLocale)->get($data); |
@@ -219,7 +219,9 @@ discard block |
||
| 219 | 219 | $repositoryAdapterName = $repositoryName.'Adapter'; |
| 220 | 220 | $repositoryNamespace = app()->namespace()->repository().'\\'.$repositoryName.'\\'.$repositoryAdapterName; |
| 221 | 221 | |
| 222 | - if($namespace) return $repositoryNamespace; |
|
| 222 | + if($namespace) {
|
|
| 223 | + return $repositoryNamespace; |
|
| 224 | + } |
|
| 223 | 225 | |
| 224 | 226 | //and eventually we conclude the adapter class of the repository package as an instance. |
| 225 | 227 | return app()->resolve($repositoryNamespace)->adapter(); |
@@ -290,8 +292,7 @@ discard block |
||
| 290 | 292 | |
| 291 | 293 | if(self::app()->has('locale')){
|
| 292 | 294 | $defaultLocale = self::app()->get('locale');
|
| 293 | - } |
|
| 294 | - else{
|
|
| 295 | + } else{
|
|
| 295 | 296 | $defaultLocale = config('app.locale');
|
| 296 | 297 | } |
| 297 | 298 | |