more fixes

dreamjobs · Jul 21, 2017 · e0fdc66 · e0fdc66
1 parent de8b5b2
commit e0fdc66
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/SitemapBuilder.php b/SitemapBuilder.php
@@ -26,12 +26,7 @@ class SitemapBuilder extends Object
     /** @var array List of xml-files for sitemap index */
     private $_filesList = [];
 
-    private $baseUrl = null;
-
-    public function __construct()
-    {
-        $this->baseUrl = $this->baseUrl ? $this->baseUrl : Yii::$app->urlManager->baseUrl;
-    }
+    public $baseUrl = null;
 
     public function writeHeader()
     {

diff --git a/SitemapController.php b/SitemapController.php
@@ -24,10 +24,10 @@ class SitemapController extends Controller
     public $sitemapFileName = 'sitemap.xml';
     /** @var array Default config for sitemap builder */
     public $builderConfig = [
-        'urlsPerFile' => 10000,
+        'urlsPerFile' => 100,
     ];
     /** @var string Base Url for sitemap links. As webroot: "http://example.com" */
-    public $baseUrl = null;
+    public $baseUrl;
 
     /**
      * @inheritdoc

diff --git a/SitemapDataHandler.php b/SitemapDataHandler.php
@@ -37,7 +37,7 @@ class SitemapDataHandler extends Object
     protected static $_appLanguage;
 
     /** @var String baseUrl */
-    private $baseUrl = null;
+    private $baseUrl;
 
     public function __construct($savePathAlias, $sitemapFileName, $baseUrl, $config = [])
     {
@@ -158,6 +158,7 @@ public function handleModel(Basic $model, $lang = null)
 
         // Search models in db
         $query = $model->getSitemapItemsQuery($lang);
+
         if ($query instanceof \yii\db\Query) {
             // Foreach batch models
             $batchSize = static::getModelBatchSize($model);
@@ -254,7 +255,7 @@ public function getBuilder()
                 'savePathAlias' => $this->savePathAlias,
                 'sitemapFileName' => $this->sitemapFileName,
                 'schemas' => $this->_schemas,
-                'baseUrl' => $this->baseUrl,
+                'baseUrl' => $this->baseUrl ? $this->baseUrl : Yii::$app->urlManager->baseUrl,
             ], $this->builderConfig);
 
             $this->_builder = Yii::createObject($config);