From ba7eea0e9df2930faf893fe693c109d13a20902f Mon Sep 17 00:00:00 2001 From: Anastasia Date: Thu, 21 Jun 2018 14:31:52 +0300 Subject: [PATCH] - bug fix --- frontend/microdata/MicrodataFabric.php | 95 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- frontend/views/service/view.php | 1 + 2 files changed, 45 insertions(+), 51 deletions(-) diff --git a/frontend/microdata/MicrodataFabric.php b/frontend/microdata/MicrodataFabric.php index 6bf50cc..b17b259 100644 --- a/frontend/microdata/MicrodataFabric.php +++ b/frontend/microdata/MicrodataFabric.php @@ -1,53 +1,46 @@ 123],self::getDefaultSettings())) - : - new ProductMicrodata(array_merge($product,['url'=>123],self::getDefaultSettings())); - } - public static function createJsonFromArticle($article=null) - { - - return ($article==null)? - new ArticleMicrodata(array_merge(['url'=>123],self::getDefaultSettings())) - : - new ArticleMicrodata(array_merge($article,['url'=>123],self::getDefaultSettings())); - } - public static function createJsonFromOrganization($article=null) - { - - return ($article==null)? - new OrganizationMicrodata(array_merge(self::getDefaultSettings())) - : - #die(var_dump(self::getDefaultSettings())); - #die(var_dump(array_merge($article,self::getDefaultSettings()))); - new OrganizationMicrodata(array_merge($article, - self::getDefaultSettings())); - } - - - - - - - protected static function getDefaultSettings(){ - return [ - 'context'=>"http://schema.org", - - ]; - - - - } - -} \ No newline at end of file + public static function createJsonFromProduct($product) + { + return ( $product == null ) ? new ProductMicrodata( + array_merge([ 'url' => 123 ], self::getDefaultSettings()) + ) : new ProductMicrodata(array_merge($product, [ 'url' => 123 ], self::getDefaultSettings())); + } + public static function createJsonFromArticle($article = null) + { + + return ( $article == null ) ? new ArticleMicrodata( + array_merge([ 'url' => 123 ], self::getDefaultSettings()) + ) : new ArticleMicrodata(array_merge($article, [ 'url' => 123 ], self::getDefaultSettings())); + } + public static function createJsonFromOrganization($article = null) + { + + return ( $article == null ) ? new OrganizationMicrodata( + array_merge(self::getDefaultSettings()) + ) : #die(var_dump(self::getDefaultSettings())); + #die(var_dump(array_merge($article,self::getDefaultSettings()))); + new OrganizationMicrodata( + array_merge( + $article, + self::getDefaultSettings() + ) + ); + } + + protected static function getDefaultSettings() + { + return [ + 'context' => "http://schema.org", + + ]; + + } + + } \ No newline at end of file diff --git a/frontend/views/service/view.php b/frontend/views/service/view.php index f92baf5..d73ae08 100644 --- a/frontend/views/service/view.php +++ b/frontend/views/service/view.php @@ -10,6 +10,7 @@ use artbox\core\helpers\ImageHelper; use artbox\core\helpers\Url; use artbox\core\models\Alias; + use common\models\Language; use common\models\Service; use yii\web\View; -- libgit2 0.21.4