Update dependencies and Makefile menu

Author: nicolaasuni

Makefile

@@ -104,28 +104,10 @@ help:
 	@echo "$(PROJECT) Makefile."
 	@echo "The following commands are available:"
 	@echo ""
-	@echo "  make buildall : Build and test everything from scratch"
-	@echo "  make bz2      : Package the library in a compressed bz2 archive"
-	@echo "  make clean    : Delete the vendor and target directories"
-	@echo "  make codefix  : Fix code style violations"
-	@echo "  make deb      : Build a DEB package for Debian-like Linux distributions"
-	@echo "  make deps     : Download all dependencies"
-	@echo "  make doc      : Generate source code documentation"
-	@echo "  make lint     : Test source code for coding standard violations"
-	@echo "  make qa       : Run all tests and reports"
-	@echo "  make report   : Generate various reports"
-	@echo "  make rpm      : Build an RPM package for RedHat-like Linux distributions"
-	@echo "  make server   : Start the development server"
-	@echo "  make test     : Run unit tests"
-	@echo "  make versionup: Increase the version patch number"
+	@awk '/^## /{desc=substr($$0,4)} /^\.PHONY:/{if(NF>1) {target=$$2; if(desc) printf "  make %-15s: %s\n",target,desc; desc=""}}' Makefile
 	@echo ""
-	@echo "  make fonts    : Import and convert fonts"
-	@echo "  make rpm_fonts: Build fonts RPM packages"
-	@echo "  make deb_fonts: Build fonts DEB packages"
-	@echo "  make bz2_fonts: Build fonts tar bz2 (tbz2) compressed archives"
-	@echo ""
-	@echo "To test and build everything from scratch:"
-	@echo "make buildall"
+	@echo "To test and build everything from scratch, use the shortcut:"
+	@echo "    make x"
 	@echo ""
 
 # alias for help target
@@ -136,24 +118,24 @@ all: help
 .PHONY: x
 x: buildall
 
-# Full build and test sequence
+## Full build and test sequence
 .PHONY: buildall
 buildall: deps codefix fonts qa bz2 rpm deb
 
-# Package the library in a compressed bz2 archive
+## Package the library in a compressed bz2 archive
 .PHONY: bz2
 bz2:
 	rm -rf $(PATHBZ2PKG)
 	make install DESTDIR=$(PATHBZ2PKG)
 	tar -jcvf $(PATHBZ2PKG)/$(PKGNAME)-$(VERSION)-$(RELEASE).tbz2 -C $(PATHBZ2PKG) $(DATADIR)
 
-# Delete the vendor and target directories
+## Delete the vendor and target directories
 .PHONY: clean
 clean:
 	rm -rf ./vendor $(TARGETDIR)
 	cd util	&& make clean
 
-# Fix code style violations
+## Fix code style violations
 .PHONY: codefix
 codefix:
 	./vendor/bin/phpcbf --config-set ignore_non_auto_fixable_on_exit 1
@@ -162,7 +144,7 @@ codefix:
 	--standard=psr12 \
 	src test
 
-# Build a DEB package for Debian-like Linux distributions
+## Build a DEB package for Debian-like Linux distributions
 .PHONY: deb
 deb:
 	rm -rf $(PATHDEBPKG)
@@ -187,7 +169,7 @@ endif
 	echo "new-package-should-close-itp-bug" > $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/$(PKGNAME).lintian-overrides
 	cd $(PATHDEBPKG)/$(PKGNAME)-$(VERSION) && debuild -us -uc
 
-# Clean all artifacts and download all dependencies
+## Clean all artifacts and download all dependencies
 .PHONY: deps
 deps: ensuretarget
 	rm -rf ./vendor/* $(TARGETDIR)/fonts
@@ -196,21 +178,21 @@ deps: ensuretarget
 	&& chmod +x ./vendor/phpstan.phar
 	cd util && make deps
 
-# Generate source code documentation
+## Generate source code documentation
 .PHONY: doc
 doc: ensuretarget
 	rm -rf $(TARGETDIR)/doc
 	$(PHPDOC) -d ./src -t $(TARGETDIR)/doc/
 
-# Create missing target directories for test and build artifacts
+## Create missing target directories for test and build artifacts
 .PHONY: ensuretarget
 ensuretarget:
 	mkdir -p $(TARGETDIR)/test
 	mkdir -p $(TARGETDIR)/report
 	mkdir -p $(TARGETDIR)/doc
 	mkdir -p $(TARGETDIR)/fonts
 
-# Install this application
+## Install this application
 .PHONY: install
 install: uninstall
 	mkdir -p $(PATHINSTBIN)
@@ -232,7 +214,7 @@ ifneq ($(strip $(CONFIGPATH)),)
 	find $(PATHINSTCFG) -type f -exec chmod 644 {} \;
 endif
 
-# Test source code for coding standard violations
+## Test source code for coding standard violations
 .PHONY: lint
 lint:
 	./vendor/bin/phpcbf --config-set ignore_non_auto_fixable_on_exit 1
@@ -241,17 +223,17 @@ lint:
 	./vendor/bin/phpmd test text unusedcode,naming,design --exclude vendor
 	php -r 'exit((int)version_compare(PHP_MAJOR_VERSION, "7", ">"));' || ./vendor/phpstan.phar analyse
 
-# Run all tests and reports
+## Run all tests and reports
 .PHONY: qa
 qa: ensuretarget lint test report
 
-# Generate various reports
+## Generate various reports
 .PHONY: report
 report: ensuretarget
 	./vendor/bin/pdepend --jdepend-xml=$(TARGETDIR)/report/dependencies.xml --summary-xml=$(TARGETDIR)/report/metrics.xml --jdepend-chart=$(TARGETDIR)/report/dependecies.svg --overview-pyramid=$(TARGETDIR)/report/overview-pyramid.svg --ignore=vendor ./src
 	#./vendor/bartlett/php-compatinfo/bin/phpcompatinfo --no-ansi analyser:run src/ > $(TARGETDIR)/report/phpcompatinfo.txt
 
-# Build the RPM package for RedHat-like Linux distributions
+## Build the RPM package for RedHat-like Linux distributions
 .PHONY: rpm
 rpm:
 	rm -rf $(PATHRPMPKG)
@@ -269,59 +251,58 @@ rpm:
 	--define "_configpath /$(CONFIGPATH)" \
 	-bb resources/rpm/rpm.spec
 
-# Start the development server
+## Start the development server
 .PHONY: server
 server:
 	$(PHP) -t example -S localhost:$(PORT)
 
-# Tag this GIT version
+## Tag this GIT version
 .PHONY: tag
 tag:
 	git checkout main && \
 	git tag -a ${VERSION} -m "Release ${VERSION}" && \
 	git push origin --tags && \
 	git pull
 
-# Run unit tests
+## Run unit tests
 .PHONY: test
 test:
 	cp phpunit.xml.dist phpunit.xml
 	#./vendor/bin/phpunit --migrate-configuration || true
 	XDEBUG_MODE=coverage ./vendor/bin/phpunit --stderr test
 
-# Remove all installed files
+## Remove all installed files
 .PHONY: uninstall
 uninstall:
 	rm -rf $(PATHINSTBIN)
 	rm -rf $(PATHINSTDOC)
 
-# Increase the version patch number
+## Increase the version patch number
 .PHONY: versionup
 versionup:
 	echo ${VERSION} | gawk -F. '{printf("%d.%d.%d\n",$$1,$$2,(($$3+1)));}' > VERSION
 
 # ----------
 
-# import and convert fonts
+## import and convert fonts
 fonts:
 	cd util && ($(COMPOSER) install -vvv --no-interaction)
 	cd util && make build
 
-# Build fonts RPM packages for RedHat-like Linux distributions
+## Build fonts RPM packages for RedHat-like Linux distributions
 rpm_fonts:
 	$(foreach PKGFONTDIR,$(FONTLIST), \
 		cd ${CURRENTDIR}/util && make rpm PKGFONTDIR=${PKGFONTDIR} ; \
 	)
 
-# Build fonts DEB packages for Debian-like Linux distributions
+## Build fonts DEB packages for Debian-like Linux distributions
 deb_fonts:
 	$(foreach PKGFONTDIR,$(FONTLIST), \
 		cd ${CURRENTDIR}/util && make deb PKGFONTDIR=${PKGFONTDIR} ; \
 	)
 
-# build fonts compressed bz2 archives
+## build fonts compressed bz2 archives
 bz2_fonts:
 	$(foreach PKGFONTDIR,$(FONTLIST), \
 		cd ${CURRENTDIR}/util && make bz2 PKGFONTDIR=${PKGFONTDIR} ; \
 	)
-

VERSION

@@ -1 +1 @@
-2.6.34
+2.6.35

composer.json

@@ -37,7 +37,7 @@
   "require-dev": {
     "pdepend/pdepend": "2.16.2",
     "phpmd/phpmd": "2.15.0",
-    "phpunit/phpunit": "13.0.5 || 12.5.14 || 11.5.55 || 10.5.63",
+    "phpunit/phpunit": "13.1.1 || 12.5.17 || 11.5.55 || 10.5.63",
     "squizlabs/php_codesniffer": "4.0.1",
     "phpcompatibility/php-compatibility": "^10.0.0@dev"
   },

resources/debian/control

@@ -10,6 +10,6 @@ Vcs-Git: https://github.com/~#VENDOR#~/~#PROJECT#~.git
 Package: ~#PKGNAME#~
 Provides: php-~#PROJECT#~
 Architecture: all
-Depends: php (>= 8.1.0), php-json, php-zip, php-tecnickcom-tc-lib-file (<< 3.0.0), php-tecnickcom-tc-lib-file (>= 2.3.2), php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.44), php-tecnickcom-tc-lib-pdf-encrypt (<< 3.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.1.36), php-tecnickcom-tc-lib-pdf-font-core (<< 2.0.0), php-tecnickcom-tc-lib-pdf-font-data-core (>= 1.8.7), ${misc:Depends}
+Depends: php (>= 8.1.0), php-json, php-zip, php-tecnickcom-tc-lib-file (<< 3.0.0), php-tecnickcom-tc-lib-file (>= 2.3.3), php-tecnickcom-tc-lib-unicode-data (<< 3.0.0), php-tecnickcom-tc-lib-unicode-data (>= 2.0.45), php-tecnickcom-tc-lib-pdf-encrypt (<< 3.0.0), php-tecnickcom-tc-lib-pdf-encrypt (>= 2.1.37), php-tecnickcom-tc-lib-pdf-font-core (<< 2.0.0), php-tecnickcom-tc-lib-pdf-font-data-core (>= 1.8.7), ${misc:Depends}
 Description: PHP PDF Fonts Library
  PHP library containing PDF font methods and utilities.

resources/rpm/rpm.spec

@@ -21,11 +21,11 @@ Requires:  php-json
 Requires:  php-pcre
 Requires:  php-zlib
 Requires:  php-composer(%{c_vendor}/tc-lib-file) < 3.0.0
-Requires:  php-composer(%{c_vendor}/tc-lib-file) >= 2.3.2
+Requires:  php-composer(%{c_vendor}/tc-lib-file) >= 2.3.3
 Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) < 3.0.0
-Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.44
+Requires:  php-composer(%{c_vendor}/tc-lib-unicode-data) >= 2.0.45
 Requires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) < 3.0.0
-Requires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 2.1.36
+Requires:  php-composer(%{c_vendor}/tc-lib-pdf-encrypt) >= 2.1.37
 Requires:  php-composer(%{c_vendor}/tc-lib-pdf-font-data-core) < 2.0.0
 Requires:  php-composer(%{c_vendor}/tc-lib-pdf-font-data-core) >= 1.8.7
 

util/Makefile

@@ -86,41 +86,35 @@ help:
 	@echo "${PROJECT} Makefile."
 	@echo "The following commands are available:"
 	@echo ""
-	@echo "    make clean       : Delete the vendor and target directory"
-	@echo "    make build       : Clean and download the composer dependencies"
-	@echo "    make update      : Update composer dependencies"
-	@echo "    make install     : Install this library"
-	@echo "    make uninstall   : Remove all installed files"
-	@echo "    make rpm         : Build an RPM package"
-	@echo "    make deb         : Build a DEB package"
-	@echo "    make bz2         : Build a tar bz2 (tbz2) compressed archive"
+	@awk '/^## /{desc=substr($$0,4)} /^\.PHONY:/{if(NF>1) {target=$$2; if(desc) printf "  make %-15s: %s\n",target,desc; desc=""}}' Makefile
 	@echo ""
 
 # alias for help target
 .PHONY: all
 all: help
 
-# delete the vendor and target directory
+## delete the vendor and target directory
 .PHONY: clean
 clean:
 	rm -rf ./vendor/
 	rm -rf ../target/fonts
 
+## Download all dependencies
 .PHONY: deps
 deps:
 	($(COMPOSER) install --no-dev --no-interaction)
 
-# clean and download the composer dependencies (all TTF font files)
+## Clean and download the composer dependencies (all TTF font files)
 .PHONY: build
 build: deps
 	./bulk_convert.php
 
-# update composer dependencies
+## Update composer dependencies
 .PHONY: update
 update:
 	($(COMPOSER) update --no-interaction)
 
-# Install this application
+## Install this application
 .PHONY: install
 install: uninstall
 	mkdir -p $(PATHINSTFONT)
@@ -135,14 +129,14 @@ install: uninstall
 	cp -f ../RELEASE $(PATHINSTDOC)
 	chmod -R 644 $(PATHINSTDOC)*
 
-# Remove all installed files
+## Remove all installed files
 .PHONY: uninstall
 uninstall:
 	rm -rf $(PATHINSTFONT)
 
 # --- PACKAGING ---
 
-# Build the RPM package for RedHat-like Linux distributions
+## Build the RPM package for RedHat-like Linux distributions
 .PHONY: rpm
 rpm:
 	rm -rf $(PATHRPMPKG)
@@ -161,7 +155,7 @@ rpm:
 	--define "_license $(PKGFONTLICENSE)" \
 	-bb ../resources/rpm/fonts.spec
 
-# Build the DEB package for Debian-like Linux distributions
+## Build the DEB package for Debian-like Linux distributions
 .PHONY: deb
 deb:
 	echo resources/fonts/control/$(DEBCOPYRIGHT)
@@ -185,7 +179,7 @@ deb:
 	echo "extra-license-file $(DOCPATH)LICENSE.gz" >> $(PATHDEBPKG)/$(PKGNAME)-$(VERSION)/debian/$(PKGNAME).lintian-overrides
 	cd $(PATHDEBPKG)/$(PKGNAME)-$(VERSION) && debuild -us -uc
 
-# build a compressed bz2 archive
+## Build a compressed bz2 archive
 .PHONY: bz2
 bz2:
 	rm -rf $(PATHBZ2PKG)