Skip to content

Commit 5216939

Browse files
committed
Merge origin/main into main
2 parents 409433d + 62e7c50 commit 5216939

File tree

227 files changed

+17504
-19151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+17504
-19151
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ fresh:
3131
git pull
3232
composer install
3333

34-
static:
34+
.PHONY: static
35+
static: ## Generate Static files by api structure
3536
composer update
3637
echo rm -rf static/*
3738
echo "STATIC #######################"
@@ -52,6 +53,10 @@ apigen:
5253
VERSION=`cat debian/composer.json | grep version | awk -F'"' '{print $4}'`; \
5354
apigen generate --destination=docs -- src
5455

56+
.PHONY: phpdoc
57+
phpdoc: ## Generate dev docs
58+
phpdoc -d src
59+
5560
pretest:
5661
composer --ansi --no-interaction update
5762
php -f tests/PrepareForTest.php

debian/changelog

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
php-spojenet-abraflexi (3.3.2) UNRELEASED; urgency=medium
1+
php-spojenet-abraflexi (3.3.2.263~noble) UNRELEASED; urgency=medium
22

33
* more strict types
4+
* jenkins-Spoje.Net-php-spojenet-abraflexi-263
45

5-
-- vitex <[email protected]> Wed, 08 Jan 2025 12:35:55 +0100
6+
-- vitex <[email protected]> Tue, 14 Jan 2025 15:10:27 +0000
67

78
php-spojenet-abraflexi (3.3.1) experimental; urgency=medium
89

debian/control

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ Priority: optional
2525
Description: PHP Based abraflexi RestAPI/Json library development files
2626
PHPUnit classes used for testing php-abraflexi functionality
2727

28-
Package: php-spojenet-abraflexi-doc
29-
Depends: ${misc:Depends}
30-
Architecture: all
31-
Replaces: php-abraflexi-doc
32-
Suggests: www-browser
33-
Section: doc
34-
Priority: optional
35-
Description: PHP Based abraflexi RestAPI/Json library Documentation
36-
PHP Based abraflexi RestAPI/Json library documentation generated by phpDocumentor.
28+
#Package: php-spojenet-abraflexi-doc
29+
#Depends: ${misc:Depends}
30+
#Architecture: all
31+
#Replaces: php-abraflexi-doc
32+
#Suggests: www-browser
33+
#Section: doc
34+
#Priority: optional
35+
#Description: PHP Based abraflexi RestAPI/Json library Documentation
36+
# PHP Based abraflexi RestAPI/Json library documentation generated by phpDocumentor.
3737

debian/rules

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
override_dh_auto_test:
77
echo tests temporarly skipped for now in rules file
88

9-
override_dh_prep:
10-
composer install --no-dev
11-
cd tools; ./update_all.sh ; cd ..
12-
phpdoc -d src
13-
mkdir -p docs ; mv .phpdoc/build/* docs
14-
dh_prep
9+
#override_dh_prep:
10+
# composer install --no-dev
11+
# cd tools; ./update_all.sh ; cd ..
12+
# phpdoc run -d src
13+
# mkdir -p docs ; mv .phpdoc/build/* docs
14+
# dh_prep
1515

1616
#override_dh_auto_test:
1717
# composer update --no-ansi --no-interaction --no-progress --no-scripts --optimize-autoloader

0 commit comments

Comments
 (0)