Skip to content

Commit

Permalink
Merge pull request #2 from hans-thomas/analysis-015W9m
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
hans-thomas committed Jul 31, 2023
2 parents 04ba9b6 + e0d69fe commit 819bf3d
Show file tree
Hide file tree
Showing 26 changed files with 1,010 additions and 953 deletions.
60 changes: 30 additions & 30 deletions config/config.php
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<?php

use Hans\Lilac\Trainers\EPAR;
use Hans\Lilac\Trainers\EPAR;

return [
/*
|--------------------------------------------------------------------------
| Trainers
|--------------------------------------------------------------------------
|
| To set your default trainer, you can set you custom implementation or
| choose one of available trainers: PAR, EPAR
|
*/
'trainers' => [
'default' => EPAR::class
],
return [
/*
|--------------------------------------------------------------------------
| Trainers
|--------------------------------------------------------------------------
|
| To set your default trainer, you can set you custom implementation or
| choose one of available trainers: PAR, EPAR
|
*/
'trainers' => [
'default' => EPAR::class,
],

/*
|--------------------------------------------------------------------------
| Relations
|--------------------------------------------------------------------------
|
| Define your relations here, these settings used for creating recommendation
|
*/
'relations' => [
\Illuminate\Database\Eloquent\Model::class => [
'wrappedByModel' => \Illuminate\Database\Eloquent\Model::class,
'wrappedByModelRelationToEntity' => 'foods',
'entityModelRelationToWrappedBy' => 'meals',
]
]
];
/*
|--------------------------------------------------------------------------
| Relations
|--------------------------------------------------------------------------
|
| Define your relations here, these settings used for creating recommendation
|
*/
'relations' => [
\Illuminate\Database\Eloquent\Model::class => [
'wrappedByModel' => \Illuminate\Database\Eloquent\Model::class,
'wrappedByModelRelationToEntity' => 'foods',
'entityModelRelationToWrappedBy' => 'meals',
],
],
];
11 changes: 5 additions & 6 deletions src/Contracts/Algorithm.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?php

namespace Hans\Lilac\Contracts;
namespace Hans\Lilac\Contracts;

interface Algorithm {

public function __invoke(): array;

}
interface Algorithm
{
public function __invoke(): array;
}
9 changes: 5 additions & 4 deletions src/Contracts/Trainer.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?php

namespace Hans\Lilac\Contracts;
namespace Hans\Lilac\Contracts;

interface Trainer {
public function run( array $config ): array;
}
interface Trainer
{
public function run(array $config): array;
}
62 changes: 31 additions & 31 deletions src/Facades/Lilac.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?php

namespace Hans\Lilac\Facades;
namespace Hans\Lilac\Facades;

use Hans\Lilac\Contracts\Trainer;
use Hans\Lilac\Services\LilacService;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Facade;
use RuntimeException;
use Hans\Lilac\Contracts\Trainer;
use Hans\Lilac\Services\LilacService;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Facade;
use RuntimeException;

/**
* @method static Collection recommends( Collection|Model $models )
* @method static LilacService updateTrainModel( Collection|Model $models )
* @method static LilacService fresh()
* @method static LilacService cache()
* @method static LilacService trainer( Trainer $trainer )
* @method static LilacService limit( int $limit )
*
* @see LilacService
*/
class Lilac extends Facade {

/**
* Get the registered name of the component.
*
* @return string
*
* @throws RuntimeException
*/
protected static function getFacadeAccessor() {
return 'lilac-service';
}

}
/**
* @method static Collection recommends( Collection|Model $models )
* @method static LilacService updateTrainModel( Collection|Model $models )
* @method static LilacService fresh()
* @method static LilacService cache()
* @method static LilacService trainer( Trainer $trainer )
* @method static LilacService limit( int $limit )
*
* @see LilacService
*/
class Lilac extends Facade
{
/**
* Get the registered name of the component.
*
* @throws RuntimeException
*
* @return string
*/
protected static function getFacadeAccessor()
{
return 'lilac-service';
}
}
28 changes: 15 additions & 13 deletions src/Helpers/functions.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<?php

if ( ! function_exists( 'lilac_config' ) ) {
function lilac_config( string $key, $default = null ): mixed {
return config( "lilac.$key", $default );
}
}
if (!function_exists('lilac_config')) {
function lilac_config(string $key, $default = null): mixed
{
return config("lilac.$key", $default);
}
}

if ( ! function_exists( 'lilac_relation_config' ) ) {
function lilac_relation_config( string $key, $default = null ): mixed {
return array_merge(
lilac_config( "relations.$key", $default ),
[ 'entity' => $key ]
);
}
}
if (!function_exists('lilac_relation_config')) {
function lilac_relation_config(string $key, $default = null): mixed
{
return array_merge(
lilac_config("relations.$key", $default),
['entity' => $key]
);
}
}
62 changes: 33 additions & 29 deletions src/Jobs/UpdateEntityTrainModel.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
<?php

namespace Hans\Lilac\Jobs;
namespace Hans\Lilac\Jobs;

use Hans\Lilac\Facades\Lilac;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Hans\Lilac\Facades\Lilac;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;

class UpdateEntityTrainModel implements ShouldQueue {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
class UpdateEntityTrainModel implements ShouldQueue
{
use Dispatchable;
use InteractsWithQueue;
use Queueable;
use SerializesModels;

/**
* Create a new job instance.
*
* @return void
*/
public function __construct(
protected Model $model
) {
/**
* Create a new job instance.
*
* @return void
*/
public function __construct(
protected Model $model
) {
}

}

/**
* Execute the job.
*
* @return void
*/
public function handle() {
Lilac::updateTrainModel( collect( [ $this->model ] ) );
}
}
/**
* Execute the job.
*
* @return void
*/
public function handle()
{
Lilac::updateTrainModel(collect([$this->model]));
}
}
62 changes: 33 additions & 29 deletions src/Jobs/UpdateWrapperTrainModel.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
<?php

namespace Hans\Lilac\Jobs;
namespace Hans\Lilac\Jobs;

use Hans\Lilac\Facades\Lilac;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Collection;
use Hans\Lilac\Facades\Lilac;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Collection;

class UpdateWrapperTrainModel implements ShouldQueue {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
class UpdateWrapperTrainModel implements ShouldQueue
{
use Dispatchable;
use InteractsWithQueue;
use Queueable;
use SerializesModels;

/**
* Create a new job instance.
*
* @return void
*/
public function __construct(
protected Collection $models
) {
/**
* Create a new job instance.
*
* @return void
*/
public function __construct(
protected Collection $models
) {
}

}

/**
* Execute the job.
*
* @return void
*/
public function handle() {
Lilac::updateTrainModel( $this->models );
}
}
/**
* Execute the job.
*
* @return void
*/
public function handle()
{
Lilac::updateTrainModel($this->models);
}
}
Loading

0 comments on commit 819bf3d

Please sign in to comment.