Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Commit 057118f

Browse files
ggrachdevggrachdev
committed
Remove exception download image if not strict mode
1 parent 055e7fc commit 057118f

File tree

4 files changed

+53
-40
lines changed

4 files changed

+53
-40
lines changed

‎ggrachdev.fish_generator/classes/general/FishGenerator/Generators/ElementGenerator.php‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ public function generate(int $countElements) {
4848

4949
$arPropertyGenerated = $this->getGeneratedPropertyArray();
5050

51-
$linkPreviewImage = $this->$dataGenerator->imageUrl(1000, 1000, $categoryPhoto);
52-
$linkDetailImage = $this->$dataGenerator->imageUrl(1000, 1000, $categoryPhoto);
51+
$linkPreviewImage = $this->dataGenerator->imageUrl(1000, 1000, $categoryPhoto);
52+
$linkDetailImage = $this->dataGenerator->imageUrl(1000, 1000, $categoryPhoto);
5353

5454
$previewPicture = $this->generatePhotoFromLink($linkPreviewImage);
5555
$detailPicture = $this->generatePhotoFromLink($linkDetailImage);
5656

5757
$arField = [
5858
'IBLOCK_ID' => $this->iblockId,
59-
'ACTIVE_FROM' => ConvertTimeStamp($this->$dataGenerator->dateTime('now')->getTimestamp(), "FULL"),
60-
'PREVIEW_TEXT' => $this->$dataGenerator->realText(100),
61-
'DETAIL_TEXT' => $this->$dataGenerator->realText(500),
59+
'ACTIVE_FROM' => ConvertTimeStamp($this->dataGenerator->dateTime('now')->getTimestamp(), "FULL"),
60+
'PREVIEW_TEXT' => $this->dataGenerator->realText(100),
61+
'DETAIL_TEXT' => $this->dataGenerator->realText(500),
6262
'PREVIEW_PICTURE' => $previewPicture,
6363
'DETAIL_PICTURE' => $detailPicture,
6464
'ACTIVE' => 'Y'
@@ -79,7 +79,7 @@ public function generate(int $countElements) {
7979
$arField['NAME'] = str_replace('$', ($i + 1), $arField['NAME']);
8080

8181
if (empty($arField['NAME'])) {
82-
$arField['NAME'] = $this->$dataGenerator->catchPhrase;
82+
$arField['NAME'] = $this->dataGenerator->catchPhrase;
8383
}
8484

8585
$arField['CODE'] = \CUtil::translit($arField['NAME'], "ru");
@@ -194,89 +194,89 @@ protected function generateItem(string $typeGenerator, array $arParams = [], int
194194
// @todo Вынести в отдельную сущность, написать через рефлексию генерации где нет параметров
195195
switch ($typeGenerator) {
196196
case 'name':
197-
$valuePropety = $this->$dataGenerator->name;
197+
$valuePropety = $this->dataGenerator->name;
198198
break;
199199

200200
case 'inn':
201-
$valuePropety = $this->$dataGenerator->inn;
201+
$valuePropety = $this->dataGenerator->inn;
202202
break;
203203

204204
case 'kpp':
205-
$valuePropety = $this->$dataGenerator->kpp;
205+
$valuePropety = $this->dataGenerator->kpp;
206206
break;
207207

208208
case 'address':
209-
$valuePropety = $this->$dataGenerator->address;
209+
$valuePropety = $this->dataGenerator->address;
210210
break;
211211

212212
case 'text':
213-
$valuePropety = $this->$dataGenerator->text;
213+
$valuePropety = $this->dataGenerator->text;
214214
break;
215215

216216
case 'word':
217-
$valuePropety = $this->$dataGenerator->word;
217+
$valuePropety = $this->dataGenerator->word;
218218
break;
219219

220220
case 'city':
221-
$valuePropety = $this->$dataGenerator->city;
221+
$valuePropety = $this->dataGenerator->city;
222222
break;
223223

224224
case 'country':
225-
$valuePropety = $this->$dataGenerator->country;
225+
$valuePropety = $this->dataGenerator->country;
226226
break;
227227

228228
case 'phoneNumber':
229-
$valuePropety = $this->$dataGenerator->phoneNumber;
229+
$valuePropety = $this->dataGenerator->phoneNumber;
230230
break;
231231

232232
case 'company':
233-
$valuePropety = $this->$dataGenerator->company;
233+
$valuePropety = $this->dataGenerator->company;
234234
break;
235235

236236
case 'email':
237-
$valuePropety = $this->$dataGenerator->email;
237+
$valuePropety = $this->dataGenerator->email;
238238
break;
239239

240240
case 'streetAddress':
241-
$valuePropety = $this->$dataGenerator->streetAddress;
241+
$valuePropety = $this->dataGenerator->streetAddress;
242242
break;
243243

244244
case 'date':
245245
// @todo Добавить формат
246-
$valuePropety = $this->$dataGenerator->date;
246+
$valuePropety = $this->dataGenerator->date;
247247
break;
248248

249249
case 'time':
250250
// @todo Добавить формат
251-
$valuePropety = $this->$dataGenerator->time;
251+
$valuePropety = $this->dataGenerator->time;
252252
break;
253253

254254
case 'year':
255-
$valuePropety = $this->$dataGenerator->year;
255+
$valuePropety = $this->dataGenerator->year;
256256
break;
257257

258258
case 'jobTitle':
259-
$valuePropety = $this->$dataGenerator->jobTitle;
259+
$valuePropety = $this->dataGenerator->jobTitle;
260260
break;
261261

262262
case 'lastName':
263-
$valuePropety = $this->$dataGenerator->lastName;
263+
$valuePropety = $this->dataGenerator->lastName;
264264
break;
265265

266266
case 'firstName':
267-
$valuePropety = $this->$dataGenerator->firstName;
267+
$valuePropety = $this->dataGenerator->firstName;
268268
break;
269269

270270
case 'hexcolor':
271-
$valuePropety = $this->$dataGenerator->hexcolor;
271+
$valuePropety = $this->dataGenerator->hexcolor;
272272
break;
273273

274274
case 'latitude':
275-
$valuePropety = $this->$dataGenerator->latitude;
275+
$valuePropety = $this->dataGenerator->latitude;
276276
break;
277277

278278
case 'longitude':
279-
$valuePropety = $this->$dataGenerator->longitude;
279+
$valuePropety = $this->dataGenerator->longitude;
280280
break;
281281

282282
case 'image':
@@ -304,7 +304,7 @@ protected function generateItem(string $typeGenerator, array $arParams = [], int
304304
$categoryPhoto = $this->getRandomCategoryPhoto();
305305

306306
$fileArray = [
307-
'VALUE' => $this->generatePhotoFromLink($this->$dataGenerator->imageUrl($width, $height, $categoryPhoto))
307+
'VALUE' => $this->generatePhotoFromLink($this->dataGenerator->imageUrl($width, $height, $categoryPhoto))
308308
];
309309

310310
if (!empty($fileArray['VALUE']['tmp_name'])) {
@@ -313,7 +313,7 @@ protected function generateItem(string $typeGenerator, array $arParams = [], int
313313
}
314314
}
315315
} else {
316-
$linkImg = $this->$dataGenerator->imageUrl($width, $height, $categoryPhoto);
316+
$linkImg = $this->dataGenerator->imageUrl($width, $height, $categoryPhoto);
317317
$valuePropety = $this->generatePhotoFromLink($linkImg);
318318
}
319319
break;
@@ -322,7 +322,7 @@ protected function generateItem(string $typeGenerator, array $arParams = [], int
322322
// @todo Сделать (1, 100) а не (1)(100)
323323
$numberFrom = is_numeric($arParams[0]) ? $arParams[0] : 0;
324324
$numberTo = is_numeric($arParams[1]) ? $arParams[1] : 100;
325-
$valuePropety = $this->$dataGenerator->numberBetween($numberFrom, $numberTo);
325+
$valuePropety = $this->dataGenerator->numberBetween($numberFrom, $numberTo);
326326
break;
327327

328328
case 'randomElement':
@@ -334,15 +334,15 @@ protected function generateItem(string $typeGenerator, array $arParams = [], int
334334
return trim($el);
335335
}, $arRand);
336336

337-
$valuePropety = $this->$dataGenerator->randomElement($arRand);
337+
$valuePropety = $this->dataGenerator->randomElement($arRand);
338338
}
339339
} else {
340340

341341
$valuePropety = [];
342342
$arRand = explode(',', $arParams[0]);
343343

344344
for ($i = 0; $i < $count; $i++) {
345-
$valuePropety[] = trim($this->$dataGenerator->randomElement($arRand));
345+
$valuePropety[] = trim($this->dataGenerator->randomElement($arRand));
346346
}
347347
}
348348
break;
@@ -351,11 +351,11 @@ protected function generateItem(string $typeGenerator, array $arParams = [], int
351351
$length = is_numeric($arParams[0]) ? $arParams[0] : 100;
352352

353353
if ($count == 1) {
354-
$valuePropety = $this->$dataGenerator->realText($length);
354+
$valuePropety = $this->dataGenerator->realText($length);
355355
} else {
356356
$valuePropety = [];
357357
for ($i = 0; $i < $count; $i++) {
358-
$valuePropety[] = trim($this->$dataGenerator->realText($length));
358+
$valuePropety[] = trim($this->dataGenerator->realText($length));
359359
}
360360
}
361361

‎ggrachdev.fish_generator/classes/general/FishGenerator/Generators/FishGenerator.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ final class FishGenerator extends ElementGenerator {
2727
*/
2828
public function __construct(int $iblockId, string $localization = 'ru_RU') {
2929

30-
if (\CModule::IncludeModule("iblock")) {
31-
$dbRes = \CIBlock::GetByID($iblockId);
30+
if (\Bitrix\Main\Loader::includeModule("iblock")) {
31+
$dbRes = \CIBlock::GetList(
32+
[],
33+
["ID" => $iblockId]
34+
);
35+
3236
if (!$dbRes->GetNext()) {
3337
throw new SearchIblockException('Указаный инфоблок не найден');
3438
}
35-
$this->$dataGenerator = \Faker\Factory::create($localization);
39+
$this->dataGenerator = \Faker\Factory::create($localization);
3640
$this->iblockId = $iblockId;
3741
} else {
3842
throw new BitrixRedactionException('Не найдены необходимые для работы библиотеки модули');

‎ggrachdev.fish_generator/classes/general/FishGenerator/Generators/PhotoGenerator.php‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
* @todo https://loremipsum.io/ru/21-of-the-best-placeholder-image-generators/
1212
*/
1313

14-
1514
/**
1615
* Все, что связано с генерацией фотографий
1716
*/
@@ -75,9 +74,17 @@ public function setCategoryPhoto($categoryPhoto): ElementFishGenerator {
7574

7675
public function generatePhotoFromLink(string $photoLink): array {
7776
$pictureArray = \CFile::MakeFileArray($photoLink);
78-
7977
if (empty($pictureArray['tmp_name'])) {
80-
throw new GeneratePhotoException('Ошибка сохранения изображения, возможно, у Вас не справляется сервер');
78+
79+
$error = 'Ошибка сохранения изображения по ссылке '.$photoLink.', возможно, у Вас не хватает ресурсов сервера или недоступен сайт lorempixel.com откуда берутся фотографии';
80+
81+
$this->addError($error);
82+
83+
if ($this->isStrictMode) {
84+
throw new GeneratePhotoException($error);
85+
}
86+
87+
$pictureArray = [];
8188
} else {
8289
$pictureArray['name'] = $pictureArray['name'] . '.jpg';
8390
}

‎ggrachdev.fish_generator/include.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"\GGrach\FishGenerator\Generators\PhotoGenerator" => "classes/general/FishGenerator/Generators/PhotoGenerator.php",
1616
"\GGrach\FishGenerator\PropertyRulesElementFilter" => "classes/general/FishGenerator/PropertyRulesElementFilter.php",
1717
"\GGrach\FishGenerator\Generators\ElementGenerator" => "classes/general/FishGenerator/Generators/ElementGenerator.php",
18+
19+
// entry point
1820
"\GGrach\FishGenerator\Generators\FishGenerator" => "classes/general/FishGenerator/Generators/FishGenerator.php",
1921
]);
2022
?>

0 commit comments

Comments
 (0)